diff options
author | Guy Harris <guy@alum.mit.edu> | 2005-08-06 03:44:55 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2005-08-06 03:44:55 +0000 |
commit | 5fb6e97fb43b2b7929a7bb20b1d408b798d95551 (patch) | |
tree | 32b19974cee8f9cb038186254b92b64e98975504 /gtk/h225_ras_srt.c | |
parent | b992c7339116ada28b7021349a6dbea9f023ded0 (diff) |
Squelch more const warnings (and fix some memory leaks that found).
_U_-ify some unused arguments, rather than assigning them to themselves.
Un-constify one variable that gets assigned a mallocated pointer.
Clean up indentation.
svn path=/trunk/; revision=15236
Diffstat (limited to 'gtk/h225_ras_srt.c')
-rw-r--r-- | gtk/h225_ras_srt.c | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/gtk/h225_ras_srt.c b/gtk/h225_ras_srt.c index 57b9399352..92a6da1c3e 100644 --- a/gtk/h225_ras_srt.c +++ b/gtk/h225_ras_srt.c @@ -55,7 +55,7 @@ #include "ui_util.h" -static void gtk_h225rassrt_init(char *optarg); +static void gtk_h225rassrt_init(const char *optarg); static tap_dfilter_dlg h225_rassrt_dlg = { "H.225 RAS Service Response Time", @@ -268,7 +268,8 @@ win_destroy_cb(GtkWindow *win _U_, gpointer data) } -static const gchar *titles[]={"RAS-Type", +static const gchar *titles[]={ + "RAS-Type", "Measurements", "Min RTT", "Max RTT", @@ -281,19 +282,18 @@ static const gchar *titles[]={"RAS-Type", "Repeated Responses" }; static void -gtk_h225rassrt_init(char *optarg) +gtk_h225rassrt_init(const char *optarg) { h225rassrt_t *hs; - char *filter=NULL; + const char *filter=NULL; GString *error_string; - GtkWidget *bbox; - GtkWidget *close_bt; + GtkWidget *bbox; + GtkWidget *close_bt; if(strncmp(optarg,"h225,srt,",9) == 0){ filter=optarg+9; } else { - filter=g_malloc(1); - *filter='\0'; + filter=""; } hs=g_malloc(sizeof(h225rassrt_t)); @@ -328,15 +328,15 @@ gtk_h225rassrt_init(char *optarg) gtk_box_pack_end(GTK_BOX(hs->vbox), bbox, FALSE, FALSE, 0); close_bt = OBJECT_GET_DATA(bbox, GTK_STOCK_CLOSE); - window_set_cancel_button(hs->win, close_bt, window_cancel_button_cb); + window_set_cancel_button(hs->win, close_bt, window_cancel_button_cb); - SIGNAL_CONNECT(hs->win, "delete_event", window_delete_event_cb, NULL); - SIGNAL_CONNECT(hs->win, "destroy", win_destroy_cb, hs); + SIGNAL_CONNECT(hs->win, "delete_event", window_delete_event_cb, NULL); + SIGNAL_CONNECT(hs->win, "destroy", win_destroy_cb, hs); gtk_widget_show_all(hs->win); - window_present(hs->win); + window_present(hs->win); - cf_retap_packets(&cfile); + cf_retap_packets(&cfile); } void |