diff options
author | Guy Harris <guy@alum.mit.edu> | 2012-12-26 05:57:06 +0000 |
---|---|---|
committer | Guy Harris <guy@alum.mit.edu> | 2012-12-26 05:57:06 +0000 |
commit | 8ed7a73e22c049a2e013bb436e599bff41fc5b9b (patch) | |
tree | ad4a4cc6fb4ff4d3e3ffe3a3f8e3d056e441ae46 /ui/gtk/mcast_stream_dlg.c | |
parent | 8ede6b7dc09aa636f87147ab432a137c209e8aca (diff) |
Fix a bunch of warnings.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
sizeof.
Cast away some implicit 64-bit-to-32-bit conversion errors due to use of
strtol() and strtoul().
Change some data types to avoid those implicit conversion warnings.
When assigning a constant to a float, make sure the constant isn't a
double, by appending "f" to the constant.
Constify a bunch of variables, parameters, and return values to
eliminate warnings due to strings being given const qualifiers. Cast
away those warnings in some cases where an API we don't control forces
us to do so.
Enable a bunch of additional warnings by default. Note why at least
some of the other warnings aren't enabled.
randpkt.c and text2pcap.c are used to build programs, so they don't need
to be in EXTRA_DIST.
If the user specifies --enable-warnings-as-errors, add -Werror *even if
the user specified --enable-extra-gcc-flags; assume they know what
they're doing and are willing to have the compile fail due to the extra
GCC warnings being treated as errors.
svn path=/trunk/; revision=46748
Diffstat (limited to 'ui/gtk/mcast_stream_dlg.c')
-rw-r--r-- | ui/gtk/mcast_stream_dlg.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/ui/gtk/mcast_stream_dlg.c b/ui/gtk/mcast_stream_dlg.c index e7d3329a89..ef7445f246 100644 --- a/ui/gtk/mcast_stream_dlg.c +++ b/ui/gtk/mcast_stream_dlg.c @@ -212,7 +212,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_1); fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te)); - fnumber = strtoul(fnumber_text, &p, 10); + fnumber = (gint)strtol(fnumber_text, &p, 10); if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) || (fnumber > 1000) ) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The burst interval should be between 1 and 1000 ms."); return; @@ -221,7 +221,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_2); fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te)); - fnumber = strtoul(fnumber_text, &p, 10); + fnumber = (gint)strtol(fnumber_text, &p, 10); if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) ) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The burst alarm threshold you entered isn't valid."); return; @@ -230,7 +230,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_3); fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te)); - fnumber = strtoul(fnumber_text, &p, 10); + fnumber = (gint)strtol(fnumber_text, &p, 10); if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) ) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The buffer alarm threshold you entered isn't valid."); return; @@ -239,7 +239,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_4); fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te)); - fnumber = strtoul(fnumber_text, &p, 10); + fnumber = (gint)strtol(fnumber_text, &p, 10); if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) || (fnumber > 10000000) ) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The stream empty speed should be between 1 and 10000000"); return; @@ -248,7 +248,7 @@ mcast_params_ok_cb(GtkWidget *ok_bt _U_, gpointer parent_w) fnumber_te = (GtkWidget *)g_object_get_data(G_OBJECT(parent_w), E_MCAST_ENTRY_5); fnumber_text = gtk_entry_get_text(GTK_ENTRY(fnumber_te)); - fnumber = strtoul(fnumber_text, &p, 10); + fnumber = (gint)strtol(fnumber_text, &p, 10); if ( (p == fnumber_text || *p != '\0') || (fnumber <= 0) || (fnumber > 10000000) ) { simple_dialog(ESD_TYPE_ERROR, ESD_BTN_OK, "The total empty speed should be between 1 and 10000000"); return; |