diff options
author | Michael Mann <mmann78@netscape.net> | 2013-01-04 05:22:43 +0000 |
---|---|---|
committer | Michael Mann <mmann78@netscape.net> | 2013-01-04 05:22:43 +0000 |
commit | 86d690880fb63891d223aa663ca5901c790b74af (patch) | |
tree | 47187c5da15e3c239e9bf40c79601c196ac0f114 /ui/gtk | |
parent | d36b4c8525161167a32eac3b1feb98f8f5d6184e (diff) |
replace "unsigned" datatype with "guint". Some mpeg files needed "unsigned int" instead.
bugs 7825-7827 (https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=7825)
svn path=/trunk/; revision=46928
Diffstat (limited to 'ui/gtk')
-rw-r--r-- | ui/gtk/capture_if_details_dlg_win32.c | 2 | ||||
-rw-r--r-- | ui/gtk/conversations_table.c | 2 | ||||
-rw-r--r-- | ui/gtk/funnel_stat.c | 6 | ||||
-rw-r--r-- | ui/gtk/hostlist_table.c | 2 | ||||
-rw-r--r-- | ui/gtk/tcp_graph.c | 2 | ||||
-rw-r--r-- | ui/gtk/uat_gui.c | 6 |
6 files changed, 10 insertions, 10 deletions
diff --git a/ui/gtk/capture_if_details_dlg_win32.c b/ui/gtk/capture_if_details_dlg_win32.c index 6f6988e2dc..9a5de12a83 100644 --- a/ui/gtk/capture_if_details_dlg_win32.c +++ b/ui/gtk/capture_if_details_dlg_win32.c @@ -1088,7 +1088,7 @@ capture_if_details_802_11_bssid_list(GtkWidget *main_vb, struct ndis_bssid_list int len = bssid_item->ie_length; unsigned char *iep = bssid_item->ies; unsigned char id; - unsigned el_len; + guint el_len; NDIS_802_11_FIXED_IEs *fixed_ies; /*#define DEBUG_IE*/ #ifdef DEBUG_IE diff --git a/ui/gtk/conversations_table.c b/ui/gtk/conversations_table.c index f003a2591c..564375ff47 100644 --- a/ui/gtk/conversations_table.c +++ b/ui/gtk/conversations_table.c @@ -2192,7 +2192,7 @@ csv_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter, csv_t *csv = (csv_t *)data; gchar *table_text; int i; - unsigned idx; + guint idx; conv_t *conv; double duration_s; guint64 value; diff --git a/ui/gtk/funnel_stat.c b/ui/gtk/funnel_stat.c index 6ec836aec4..da0547afbd 100644 --- a/ui/gtk/funnel_stat.c +++ b/ui/gtk/funnel_stat.c @@ -96,7 +96,7 @@ static void text_window_cancel_button_cb(GtkWidget *bt _U_, gpointer data) { static void unref_text_win_cancel_bt_cb(GtkWidget *bt _U_, gpointer data) { funnel_text_window_t* tw = data; - unsigned i; + guint i; window_destroy(GTK_WIDGET(tw->win)); tw->win = NULL; @@ -117,7 +117,7 @@ static void unref_text_win_cancel_bt_cb(GtkWidget *bt _U_, gpointer data) { static gboolean text_window_unref_del_event_cb(GtkWidget *win _U_, GdkEvent *event _U_, gpointer user_data) { funnel_text_window_t* tw = user_data; - unsigned i; + guint i; window_destroy(GTK_WIDGET(tw->win)); tw->win = NULL; @@ -320,7 +320,7 @@ static void text_window_destroy(funnel_text_window_t* tw) { g_signal_connect(tw->bt_close, "clicked", G_CALLBACK(unref_text_win_cancel_bt_cb), tw); g_signal_connect(tw->win, "delete-event", G_CALLBACK(text_window_unref_del_event_cb), tw); } else { - unsigned i; + guint i; /* * we have no window anymore a human user closed * the window already just free the container diff --git a/ui/gtk/hostlist_table.c b/ui/gtk/hostlist_table.c index 9c7ed95246..f5582b8312 100644 --- a/ui/gtk/hostlist_table.c +++ b/ui/gtk/hostlist_table.c @@ -835,7 +835,7 @@ csv_handle(GtkTreeModel *model, GtkTreePath *path _U_, GtkTreeIter *iter, csv_t *csv = (csv_t *)data; gchar *table_text; int i; - unsigned idx; + guint idx; guint64 value; gtk_tree_model_get(model, iter, INDEX_COLUMN, &idx, -1); diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c index f89ec98ded..906d09bc1b 100644 --- a/ui/gtk/tcp_graph.c +++ b/ui/gtk/tcp_graph.c @@ -586,7 +586,7 @@ static char helptext[] = #if 0 static void debug_coord (struct graph *g, const char *c) { - static unsigned count = 0; + static guint count = 0; count++; printf("%u: %s\n", count, c); diff --git a/ui/gtk/uat_gui.c b/ui/gtk/uat_gui.c index 880f67fcf9..4d27a057b8 100644 --- a/ui/gtk/uat_gui.c +++ b/ui/gtk/uat_gui.c @@ -99,7 +99,7 @@ struct _uat_rep_t { struct _str_pair { const char* ptr; - unsigned len; + guint len; }; struct _uat_dlg_data { @@ -226,7 +226,7 @@ static guint8* unhexbytes(const char* si, guint len, guint* len_p, const char** guint8* buf; guint8* p; const guint8* s = (void*)si; - unsigned i; + guint i; if (len % 2) { *err = ep_strdup_printf("Uneven number of chars hex string %u \n'%s'",len, si); @@ -293,7 +293,7 @@ static gboolean uat_dlg_cb(GtkWidget *win _U_, gpointer user_data) { void* e = g_ptr_array_index(dd->entries,colnum); const char *text = NULL; char *text_free = NULL; - unsigned len = 0; + guint len = 0; switch(f[colnum].mode) { case PT_TXTMOD_FILENAME: |