diff options
| author | Guy Harris <guy@alum.mit.edu> | 2007-04-23 10:59:26 +0000 |
|---|---|---|
| committer | Guy Harris <guy@alum.mit.edu> | 2007-04-23 10:59:26 +0000 |
| commit | 1bc049906a35c3490532ab68fcbf90750c225f77 (patch) | |
| tree | f690697725617a640820ade652da4cf766bdc863 /gtk | |
| parent | 7dc9df5f26ed136405fd1e99d62ebc3a6bf92dd5 (diff) | |
Add some GCC warnings to the standard set, and add some others to the
--enable-extra-gcc-checks set.
If we turn on -pedantic, try turning on -Wno-long-long as well, so that
it's not *so* pedantic that it rejects the 64-bit integral data types
that we explicitly require.
Constify a bunch of stuff, and make some other changes, to get rid of
warnings.
Clean up some indentation.
svn path=/trunk/; revision=21526
Diffstat (limited to 'gtk')
| -rw-r--r-- | gtk/decode_as_dlg.c | 4 | ||||
| -rw-r--r-- | gtk/funnel_stat.c | 2 | ||||
| -rw-r--r-- | gtk/uat_gui.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index e8e36223cf..1beacd4994 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -186,7 +186,7 @@ GSList *dissector_reset_list = NULL; * @param user_data Unused. */ static void -decode_build_reset_list (gchar *table_name, ftenum_t selector_type, +decode_build_reset_list (const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value _U_, gpointer user_data _U_) { @@ -319,7 +319,7 @@ const gchar *current_proto_name) * should be stored. */ static void -decode_build_show_list (gchar *table_name, ftenum_t selector_type, +decode_build_show_list (const gchar *table_name, ftenum_t selector_type, gpointer key, gpointer value, gpointer user_data) { dissector_handle_t current, initial; diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c index b3366f5efc..c96d052e1f 100644 --- a/gtk/funnel_stat.c +++ b/gtk/funnel_stat.c @@ -549,7 +549,7 @@ static void funnel_retap_packets(void) { cf_retap_packets(&cfile, FALSE); } -static gboolean funnel_open_file(const char* fname, const char* filter, char** err_str) { +static gboolean funnel_open_file(const char* fname, const char* filter, const char** err_str) { int err = 0; dfilter_t *rfcode = NULL; diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c index b032d0858f..34390dde8d 100644 --- a/gtk/uat_gui.c +++ b/gtk/uat_gui.c @@ -145,7 +145,7 @@ static void set_buttons(uat_t* uat, gint row) { static char* fld_tostr(void* rec, uat_field_t* f) { guint len; - char* ptr; + const char* ptr; char* out; f->cb.tostr(rec,&ptr,&len,f->cbdata.tostr,f->fld_data); @@ -216,7 +216,7 @@ static void reset_row(uat_t* uat, guint idx) { } -static guint8* unhexbytes(const char* si, guint len, guint* len_p, char** err) { +static guint8* unhexbytes(const char* si, guint len, guint* len_p, const char** err) { guint8* buf; guint8* p; const guint8* s = (void*)si; @@ -280,7 +280,7 @@ static gboolean uat_dlg_cb(GtkWidget *win _U_, gpointer user_data) { struct _uat_dlg_data* dd = user_data; guint ncols = dd->uat->ncols; uat_field_t* f = dd->uat->fields; - char* err = NULL; + const char* err = NULL; guint colnum; for ( colnum = 0; colnum < ncols; colnum++ ) { |