diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-12-09 09:02:14 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-12-09 09:02:14 +0000 |
| commit | 88adb489c349c47f8df5effa049e5ae52e5497c1 (patch) | |
| tree | 739917b8cc1594d8b1dfc5cea21cd7356ddc8986 | |
| parent | 191da2295c3e997de25365348e7db113467a1506 (diff) | |
| download | wireshark-88adb489c349c47f8df5effa049e5ae52e5497c1.tar.gz wireshark-88adb489c349c47f8df5effa049e5ae52e5497c1.tar.bz2 wireshark-88adb489c349c47f8df5effa049e5ae52e5497c1.zip | |
Add extra parenthesization, tweak name of argument to some macros to
more accurately reflect what it is.
svn path=/trunk/; revision=23814
| -rw-r--r-- | gtk/expert_comp_table.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/gtk/expert_comp_table.c b/gtk/expert_comp_table.c index a1e1809640..5a1775e29e 100644 --- a/gtk/expert_comp_table.c +++ b/gtk/expert_comp_table.c @@ -223,17 +223,17 @@ static gint find_summary_data(error_equiv_table *err, const expert_info_t *exper #define ACTYPE_OR_NOT_SELECTED 5 /* Encoded callback arguments */ -#define CALLBACK_MATCH(type) (ACTION_MATCH<<8 | (type)) -#define CALLBACK_PREPARE(type) (ACTION_PREPARE<<8 | (type)) -#define CALLBACK_FIND_FRAME(type) (ACTION_FIND_FRAME<<8 | (type)) -#define CALLBACK_FIND_NEXT(type) (ACTION_FIND_NEXT<<8 | (type)) -#define CALLBACK_FIND_PREVIOUS(type) (ACTION_FIND_PREVIOUS<<8 | (type)) -#define CALLBACK_COLORIZE(type) (ACTION_COLORIZE<<8 | (type)) +#define CALLBACK_MATCH(type) ((ACTION_MATCH<<8) | (type)) +#define CALLBACK_PREPARE(type) ((ACTION_PREPARE<<8) | (type)) +#define CALLBACK_FIND_FRAME(type) ((ACTION_FIND_FRAME<<8) | (type)) +#define CALLBACK_FIND_NEXT(type) ((ACTION_FIND_NEXT<<8) | (type)) +#define CALLBACK_FIND_PREVIOUS(type) ((ACTION_FIND_PREVIOUS<<8) | (type)) +#define CALLBACK_COLORIZE(type) ((ACTION_COLORIZE<<8) | (type)) #define CALLBACK_WEB_LOOKUP (ACTION_WEB_LOOKUP<<8) /* Extract components of callback argument */ -#define FILTER_ACTION(cb_action) (((cb_action)>>8) & 0xff) -#define FILTER_ACTYPE(cb_action) ((cb_action)&0xff) +#define FILTER_ACTION(cb_arg) (((cb_arg)>>8) & 0xff) +#define FILTER_ACTYPE(cb_arg) ((cb_arg) & 0xff) static void error_select_filter_cb(GtkWidget *widget _U_, gpointer callback_data, guint callback_action) |