forked from osmocom/wireshark
Add a name field to tap_param, for use in error messages.
Change-Id: Ia4317b61ff30e269eba0ee2ea2c46f1668544b1b Reviewed-on: https://code.wireshark.org/review/5309 Reviewed-by: Guy Harris <guy@alum.mit.edu>
This commit is contained in:
parent
04ab731933
commit
99b6afbc28
|
@ -45,10 +45,11 @@ typedef enum {
|
|||
} param_type;
|
||||
|
||||
typedef struct _tap_param {
|
||||
param_type type;
|
||||
const char *title;
|
||||
const enum_val_t *enum_vals;
|
||||
gboolean optional;
|
||||
param_type type; /* type of parameter */
|
||||
const char *name; /* name to use in error messages */
|
||||
const char *title; /* title to use in GUI widgets */
|
||||
const enum_val_t *enum_vals; /* values for PARAM_ENUM */
|
||||
gboolean optional; /* TRUE if the parameter is optional */
|
||||
} tap_param;
|
||||
|
||||
/*
|
||||
|
|
|
@ -185,7 +185,7 @@ gtk_afpstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param afp_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg afp_stat_dlg = {
|
||||
|
|
|
@ -253,7 +253,7 @@ dhcpstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param bootp_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg dhcp_stat_dlg = {
|
||||
|
|
|
@ -206,7 +206,7 @@ static void gtk_camelcounter_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param camel_counter_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg camel_counter_dlg = {
|
||||
|
|
|
@ -218,7 +218,7 @@ static void gtk_camelsrt_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param camel_srt_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg camel_srt_dlg = {
|
||||
|
|
|
@ -214,7 +214,7 @@ gtk_diameterstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param diameter_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg diameter_stat_dlg = {
|
||||
|
|
|
@ -190,7 +190,7 @@ gtk_fcstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param fc_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg fc_stat_dlg = {
|
||||
|
|
|
@ -209,7 +209,7 @@ gtk_gtpstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param gtp_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg gtp_stat_dlg = {
|
||||
|
|
|
@ -50,7 +50,7 @@ void register_tap_listener_gtk_h225counter(void);
|
|||
static void gtk_h225counter_init(const char *opt_arg, void *userdata);
|
||||
|
||||
static tap_param h225_counter_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg h225_counter_dlg = {
|
||||
|
|
|
@ -51,7 +51,7 @@ void register_tap_listener_gtk_h225rassrt(void);
|
|||
static void gtk_h225rassrt_init(const char *opt_arg, void *userdata);
|
||||
|
||||
static tap_param h225_rassrt_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg h225_rassrt_dlg = {
|
||||
|
|
|
@ -223,7 +223,7 @@ gtk_ldapstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param ldap_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg ldap_stat_dlg = {
|
||||
|
|
|
@ -1405,7 +1405,7 @@ static void gtk_mac_lte_stat_init(const char *opt_arg, void *userdata _U_)
|
|||
|
||||
|
||||
static tap_param mac_lte_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg mac_lte_stat_dlg = {
|
||||
|
|
|
@ -209,7 +209,7 @@ gtk_megacostat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param megaco_srt_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg megaco_srt_dlg = {
|
||||
|
|
|
@ -296,7 +296,7 @@ gtk_mgcpstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param mgcp_srt_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg mgcp_srt_dlg = {
|
||||
|
|
|
@ -705,7 +705,7 @@ gtk_ncpstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param ncp_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg ncp_stat_dlg = {
|
||||
|
|
|
@ -365,7 +365,7 @@ gtk_radiusstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param radius_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg radius_srt_dlg = {
|
||||
|
|
|
@ -1649,7 +1649,7 @@ static void gtk_rlc_lte_stat_init(const char *opt_arg, void *userdata _U_)
|
|||
|
||||
|
||||
static tap_param rlc_lte_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg rlc_lte_stat_dlg = {
|
||||
|
|
|
@ -283,8 +283,8 @@ static const enum_val_t scsi_command_sets[] = {
|
|||
};
|
||||
|
||||
static tap_param scsi_stat_params[] = {
|
||||
{ PARAM_ENUM, "Command set", scsi_command_sets, FALSE },
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_ENUM, "cmdset", "Command set", scsi_command_sets, FALSE },
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg scsi_stat_dlg = {
|
||||
|
|
|
@ -53,7 +53,7 @@ void register_tap_listener_sctpstat(void);
|
|||
static void sctpstat_init(const char *opt_arg, void *userdata);
|
||||
|
||||
static tap_param sctp_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg sctp_stat_dlg = {
|
||||
|
|
|
@ -675,7 +675,7 @@ gtk_sipstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param sip_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg sip_stat_dlg = {
|
||||
|
|
|
@ -198,7 +198,7 @@ gtk_smb2stat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param smb2_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg smb2_stat_dlg = {
|
||||
|
|
|
@ -227,7 +227,7 @@ gtk_smbstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param smb_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg smb_stat_dlg = {
|
||||
|
|
|
@ -541,7 +541,7 @@ init_gtk_tree(const char* opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param tree_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static void
|
||||
|
|
|
@ -399,7 +399,7 @@ gtk_wspstat_init(const char *opt_arg, void *userdata _U_)
|
|||
}
|
||||
|
||||
static tap_param wsp_stat_params[] = {
|
||||
{ PARAM_FILTER, "Filter", NULL, TRUE }
|
||||
{ PARAM_FILTER, "filter", "Filter", NULL, TRUE }
|
||||
};
|
||||
|
||||
static tap_param_dlg wsp_stat_dlg = {
|
||||
|
|
Loading…
Reference in New Issue