Skip to content

Force notification functions to end in the same way #463

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lguohan merged 1 commit into from
Mar 17, 2017
Merged

Force notification functions to end in the same way #463

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions inc/saiswitch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1188,9 +1188,9 @@ typedef enum _sai_switch_attr_t
/**
* @brief Set Switch shutdown notification callback function passed to the adapter.
*
* Use sai_switch_shutdown_request_fn as notification function.
* Use sai_switch_shutdown_request_notification_fn as notification function.
*
* @type sai_pointer_t sai_switch_shutdown_request_fn
* @type sai_pointer_t sai_switch_shutdown_request_notification_fn
* @flags CREATE_AND_SET
* @default NULL
*/
Expand Down Expand Up @@ -1399,7 +1399,7 @@ typedef enum _sai_switch_attr_t
*
* @param[in] switch_id Switch Id
*/
typedef void (*sai_switch_shutdown_request_fn)(
typedef void (*sai_switch_shutdown_request_notification_fn)(
_In_ sai_object_id_t switch_id);

/**
Expand Down
9 changes: 8 additions & 1 deletion meta/parse.pl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,15 @@ sub ProcessTagType
return $val;
}

if ($val =~/^sai_pointer_t sai_\w+_fn$/)
if ($val =~/^sai_pointer_t (sai_\w+_fn)$/)
{
my $pointerfn = $1;

if (not $pointerfn =~ /^sai_\w+_(callback|notification)_fn$/)
{
LogWarning "function name $pointerfn should be in format sai_\\w+_(callback|notification)_fn";
}

return $val;
}

Expand Down