diff options
44 files changed, 113 insertions, 116 deletions
diff --git a/configure.in b/configure.in index f31aa0ee50..a757ebf0a6 100644 --- a/configure.in +++ b/configure.in @@ -241,12 +241,8 @@ AC_ARG_ENABLE(extra-gcc-checks, # for now. # AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wwrite-strings) - AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wshorten-64-to-32) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wstrict-prototypes) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wmissing-declarations) - #Temporarily put cast-align here waiting eradication of 'cast - #increases required alignment of target type' on the Solaris - #slave. # # epan/dissectors/packet-afs.c blocks this one for now. # @@ -261,6 +257,7 @@ AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wno-pointer-sign) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Warray-bounds) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wcast-align) AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wformat-security) +AC_WIRESHARK_GCC_CFLAGS_CHECK(-Wshorten-64-to-32) # # If we're running gcc add '-D_U_="__attribute__((unused))"' to CFLAGS as well, diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c index dfa7256b2e..10f535eeb9 100644 --- a/epan/dissectors/packet-cops.c +++ b/epan/dissectors/packet-cops.c @@ -2517,7 +2517,7 @@ info_to_display(tvbuff_t *tvb, proto_item *stt, int offset, int octets, const ch guint16 code16 = 0; guint32 codeipv4 = 0; guint32 code32 = 0; - float codefl = 0.0; + float codefl = 0.0f; /* Print information elements in the specified way */ switch (octets) { diff --git a/epan/dissectors/packet-ssl.c b/epan/dissectors/packet-ssl.c index b4d38dd331..a436b6b9d1 100644 --- a/epan/dissectors/packet-ssl.c +++ b/epan/dissectors/packet-ssl.c @@ -340,7 +340,7 @@ ssl_parse(void) if ((ssl_keys_file = ws_fopen(ssl_keys_list, "r"))) { read_failed = FALSE; fstat(fileno(ssl_keys_file), &statb); - size = statb.st_size; + size = (size_t)statb.st_size; tmp_buf = ep_alloc0(size + 1); nbytes = fread(tmp_buf, 1, size, ssl_keys_file); if (ferror(ssl_keys_file)) { @@ -445,7 +445,7 @@ cf_read(capture_file *cf) else progbar_quantum = 0; /* Progress so far. */ - progbar_val = 0.0; + progbar_val = 0.0f; packet_list_freeze(); @@ -482,8 +482,8 @@ cf_read(capture_file *cf) case there's not much we can do about it), or the file *shrank* (in which case there's not much we can do about it); just clip the progress value at 1.0. */ - if (progbar_val > 1.0) - progbar_val = 1.0; + if (progbar_val > 1.0f) + progbar_val = 1.0f; } if (progbar != NULL) { /* update the packet lists content on the first run or frequently on very large files */ @@ -1242,7 +1242,7 @@ cf_merge_files(char **out_filenamep, int in_file_count, bump that value by this amount. */ progbar_quantum = f_len/N_PROGBAR_UPDATES; /* Progress so far. */ - progbar_val = 0.0; + progbar_val = 0.0f; stop_flag = FALSE; g_get_current_time(&start_time); @@ -1287,11 +1287,11 @@ cf_merge_files(char **out_filenamep, int in_file_count, for (i = 0; i < in_file_count; i++) file_pos += wtap_read_so_far(in_files[i].wth, NULL); progbar_val = (gfloat) file_pos / (gfloat) f_len; - if (progbar_val > 1.0) { + if (progbar_val > 1.0f) { /* Some file probably grew while we were reading it. That "shouldn't happen", so we'll just clip the progress value at 1.0. */ - progbar_val = 1.0; + progbar_val = 1.0f; } if (progbar != NULL) { g_snprintf(status_str, sizeof(status_str), @@ -1572,7 +1572,7 @@ rescan_packets(capture_file *cf, const char *action, const char *action_item, /* Count of packets at which we've looked. */ count = 0; /* Progress so far. */ - progbar_val = 0.0; + progbar_val = 0.0f; stop_flag = FALSE; g_get_current_time(&start_time); @@ -1810,7 +1810,7 @@ process_specified_packets(capture_file *cf, packet_range_t *range, /* Count of packets at which we've looked. */ progbar_count = 0; /* Progress so far. */ - progbar_val = 0.0; + progbar_val = 0.0f; progbar_stop_flag = FALSE; g_get_current_time(&progbar_start_time); @@ -2567,7 +2567,7 @@ cf_change_time_formats(capture_file *cf) /* Count of packets at which we've looked. */ count = 0; /* Progress so far. */ - progbar_val = 0.0; + progbar_val = 0.0f; /* If the rows are currently sorted by the frame column then we know * the row number of each packet: it's the row number of the previously @@ -3053,7 +3053,7 @@ find_packet(capture_file *cf, bump that value by this amount. */ progbar_quantum = cf->count/N_PROGBAR_UPDATES; /* Progress so far. */ - progbar_val = 0.0; + progbar_val = 0.0f; stop_flag = FALSE; g_get_current_time(&start_time); @@ -35,7 +35,7 @@ typedef struct _fileset_entry { const char *name; /* File name without path (g_strdup'ed) */ time_t ctime; /* create time */ time_t mtime; /* last modified time */ - long size; /* size of file in bytes */ + gint64 size; /* size of file in bytes */ gboolean current; /* is this the currently loaded file? */ } fileset_entry; diff --git a/gtk/about_dlg.c b/gtk/about_dlg.c index 65212ee578..81de4c7315 100644 --- a/gtk/about_dlg.c +++ b/gtk/about_dlg.c @@ -140,7 +140,7 @@ splash_new(const char *message) g_object_set_data(G_OBJECT(win), "progress_bar", prog_bar); percentage_lb = gtk_label_new(" 0%"); - gtk_misc_set_alignment(GTK_MISC(percentage_lb), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(percentage_lb), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(percentage_hb), percentage_lb, FALSE, TRUE, 3); g_object_set_data(G_OBJECT(win), "percentage_label", percentage_lb); diff --git a/gtk/ansi_map_stat.c b/gtk/ansi_map_stat.c index c0c4244669..a7750b9662 100644 --- a/gtk/ansi_map_stat.c +++ b/gtk/ansi_map_stat.c @@ -252,7 +252,7 @@ ansi_map_stat_draw( list_store = GTK_LIST_STORE(gtk_tree_view_get_model(GTK_TREE_VIEW (dlg.table))); /* Get store */ while (ansi_map_opr_code_strings[i].strptr) { - avg = 0.0; + avg = 0.0f; if (stat_p->message_type[ansi_map_opr_code_strings[i].value] !=0 ){ avg = (float)stat_p->size[ansi_map_opr_code_strings[i].value]/(float)stat_p->message_type[ansi_map_opr_code_strings[i].value]; } diff --git a/gtk/capture_dlg.c b/gtk/capture_dlg.c index 95cdd88058..f725fc71d6 100644 --- a/gtk/capture_dlg.c +++ b/gtk/capture_dlg.c @@ -1745,7 +1745,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_box_pack_start (GTK_BOX(snap_hb), snap_sb, FALSE, FALSE, 0); snap_lb = gtk_label_new("bytes"); - gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(snap_lb), 0, 0.5f); gtk_box_pack_start(GTK_BOX(snap_hb), snap_lb, FALSE, FALSE, 0); /* Filter row */ @@ -1975,7 +1975,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_sb, 1, 2, row, row+1); ringbuffer_nbf_lb = gtk_label_new("files"); - gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(ringbuffer_nbf_lb), 0, 0.5f); gtk_table_attach_defaults(GTK_TABLE(multi_tb), ringbuffer_nbf_lb, 2, 3, row, row+1); row++; @@ -1996,7 +1996,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_sb, 1, 2, row, row+1); stop_files_lb = gtk_label_new("file(s)"); - gtk_misc_set_alignment(GTK_MISC(stop_files_lb), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(stop_files_lb), 0, 0.5f); gtk_table_attach_defaults(GTK_TABLE(multi_tb), stop_files_lb, 2, 3, row, row+1); row++; @@ -2032,7 +2032,7 @@ capture_prep_cb(GtkWidget *w _U_, gpointer d _U_) gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_sb, 1, 2, row, row+1); stop_packets_lb = gtk_label_new("packet(s)"); - gtk_misc_set_alignment(GTK_MISC(stop_packets_lb), 0, 0.5); + gtk_misc_set_alignment(GTK_MISC(stop_packets_lb), 0, 0.5f); gtk_table_attach_defaults(GTK_TABLE(limit_tb), stop_packets_lb, 2, 3, row, row+1); row++; diff --git a/gtk/capture_file_dlg.c b/gtk/capture_file_dlg.c index a3364af521..358803a437 100644 --- a/gtk/capture_file_dlg.c +++ b/gtk/capture_file_dlg.c @@ -361,12 +361,12 @@ add_string_to_table_sensitive(GtkWidget *list, guint *row, const gchar *title, c } label = gtk_label_new(indent); g_free(indent); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_widget_set_sensitive(label, sensitive); gtk_table_attach_defaults(GTK_TABLE(list), label, 0, 1, *row, *row+1); label = gtk_label_new(value); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_widget_set_sensitive(label, sensitive); gtk_table_attach_defaults(GTK_TABLE(list), label, 1, 2, *row, *row+1); diff --git a/gtk/capture_if_dlg.c b/gtk/capture_if_dlg.c index aa5bf3a063..dc23df0c29 100644 --- a/gtk/capture_if_dlg.c +++ b/gtk/capture_if_dlg.c @@ -659,7 +659,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) if_dlg_data->device_lb = gtk_label_new(if_info->name); if_dlg_data->device = if_info->name; #ifndef _WIN32 - gtk_misc_set_alignment(GTK_MISC(if_dlg_data->device_lb), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_dlg_data->device_lb), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->device_lb, 1, 2, row, row+1); #endif g_string_append(if_tool_str, "Device: "); @@ -671,7 +671,7 @@ capture_if_cb(GtkWidget *w _U_, gpointer d _U_) if_dlg_data->descr_lb = gtk_label_new(if_info->description); else if_dlg_data->descr_lb = gtk_label_new(""); - gtk_misc_set_alignment(GTK_MISC(if_dlg_data->descr_lb), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_dlg_data->descr_lb), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(if_tb), if_dlg_data->descr_lb, 2, 3, row, row+1); if (if_info->description) { diff --git a/gtk/capture_info_dlg.c b/gtk/capture_info_dlg.c index b91ab1885d..03b9f64be6 100644 --- a/gtk/capture_info_dlg.c +++ b/gtk/capture_info_dlg.c @@ -85,7 +85,7 @@ pct(gint num, gint denom) { if (denom) { return (float) (num * 100.0 / denom); } else { - return 0.0; + return 0.0f; } } diff --git a/gtk/color_dlg.c b/gtk/color_dlg.c index 25efcc99bc..e2bb740cef 100644 --- a/gtk/color_dlg.c +++ b/gtk/color_dlg.c @@ -585,7 +585,7 @@ static void remember_this_row (GtkTreeModel *model, GtkTreePath *path, GtkTreeIt data->count++; - gtk_tree_view_scroll_to_cell(data->color_filters, path, NULL, FALSE, 0.0, 0.0); + gtk_tree_view_scroll_to_cell(data->color_filters, path, NULL, FALSE, 0.0f, 0.0f); } /* clear the selection flag of this filter */ diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c index 8f1e928066..2285f87c7a 100644 --- a/gtk/decode_as_dlg.c +++ b/gtk/decode_as_dlg.c @@ -1028,7 +1028,7 @@ decode_add_pack_menu (GtkWidget *optmenu) { GtkWidget *alignment; - alignment = gtk_alignment_new(0.0, 0.5, 0.0, 0.0); + alignment = gtk_alignment_new(0.0f, 0.5f, 0.0f, 0.0f); gtk_container_add(GTK_CONTAINER(alignment), optmenu); return(alignment); diff --git a/gtk/dfilter_expr_dlg.c b/gtk/dfilter_expr_dlg.c index 7f655ff7ab..f80ac69ac6 100644 --- a/gtk/dfilter_expr_dlg.c +++ b/gtk/dfilter_expr_dlg.c @@ -960,7 +960,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) gtk_container_add(GTK_CONTAINER(main_hb), field_vb); field_tree_lb = gtk_label_new("Field name"); - gtk_misc_set_alignment(GTK_MISC(field_tree_lb), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(field_tree_lb), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(field_vb), field_tree_lb, FALSE, FALSE, 0); tree_scrolled_win = scrolled_window_new(NULL, NULL); @@ -989,7 +989,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) gtk_container_add(GTK_CONTAINER(main_hb), relation_vb); relation_label = gtk_label_new("Relation"); - gtk_misc_set_alignment(GTK_MISC(relation_label), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(relation_label), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(relation_vb), relation_label, FALSE, FALSE, 0); relation_list_scrolled_win = scrolled_window_new(NULL, NULL); @@ -1064,14 +1064,14 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) gtk_container_add(GTK_CONTAINER(main_hb), value_vb); value_label = gtk_label_new("Value"); - gtk_misc_set_alignment(GTK_MISC(value_label), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(value_label), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(value_vb), value_label, FALSE, FALSE, 0); value_entry = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(value_vb), value_entry, FALSE, FALSE, 0); value_list_label = gtk_label_new("Predefined values:"); - gtk_misc_set_alignment(GTK_MISC(value_list_label), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(value_list_label), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(value_vb), value_list_label, FALSE, FALSE, 0); value_list_scrolled_win = scrolled_window_new(NULL, NULL); @@ -1161,7 +1161,7 @@ dfilter_expr_dlg_new(GtkWidget *filter_te) } range_label = gtk_label_new("Range (offset:length)"); - gtk_misc_set_alignment(GTK_MISC(range_label), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(range_label), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(value_vb), range_label, FALSE, FALSE, 0); range_entry = gtk_entry_new(); diff --git a/gtk/expert_comp_dlg.c b/gtk/expert_comp_dlg.c index c2a0c7cf12..3842724c15 100644 --- a/gtk/expert_comp_dlg.c +++ b/gtk/expert_comp_dlg.c @@ -299,7 +299,7 @@ expert_comp_init(const char *optarg _U_, void* userdata _U_) gtk_notebook_append_page(GTK_NOTEBOOK(main_nb), temp_page, ss->all_label); etd->label=gtk_label_new("Please wait ..."); - gtk_misc_set_alignment(GTK_MISC(etd->label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(etd->label), 0.0f, 0.5f); etd->win=ss->win; expert_dlg_init_table(etd, temp_page); diff --git a/gtk/expert_dlg.c b/gtk/expert_dlg.c index 205d3c6bce..074ab1bb84 100644 --- a/gtk/expert_dlg.c +++ b/gtk/expert_dlg.c @@ -251,7 +251,7 @@ expert_dlg_draw(void *data) if(etd->disp_events < 1000) gtk_clist_columns_autosize(etd->table); gtk_clist_moveto(etd->table, - etd->disp_events - 1, -1, 1.0, 1.0); + etd->disp_events - 1, -1, 1.0f, 1.0f); gtk_clist_thaw(etd->table); if(etd->label) { @@ -510,7 +510,7 @@ expert_dlg_init(const char *optarg, void* userdata _U_) gtk_box_pack_start(GTK_BOX(vbox), table, FALSE, FALSE, 0); etd->label=gtk_label_new("Please wait ..."); - gtk_misc_set_alignment(GTK_MISC(etd->label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(etd->label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), etd->label, 0, 1, 0, 1); severity_box = gtk_hbox_new(FALSE, 0); diff --git a/gtk/fileset_dlg.c b/gtk/fileset_dlg.c index 5636f8bf87..3f51939e88 100644 --- a/gtk/fileset_dlg.c +++ b/gtk/fileset_dlg.c @@ -177,7 +177,7 @@ fileset_dlg_add_file(fileset_entry *entry) { modified = g_strdup_printf("%04u.%02u.%02u %02u:%02u:%02u", local->tm_year+1900, local->tm_mon+1, local->tm_mday, local->tm_hour, local->tm_min, local->tm_sec); - size = g_strdup_printf("%ld Bytes", entry->size); + size = g_strdup_printf("%" G_GINT64_MODIFIER "d Bytes", entry->size); fs_rb = gtk_radio_button_new_with_label_from_widget( fs_first_rb ? GTK_RADIO_BUTTON(fs_first_rb) : NULL, entry->name); diff --git a/gtk/find_dlg.c b/gtk/find_dlg.c index 59dcff6cc5..d83ab1504b 100644 --- a/gtk/find_dlg.c +++ b/gtk/find_dlg.c @@ -282,7 +282,7 @@ find_frame_cb(GtkWidget *w _U_, gpointer d _U_) combo_lb = gtk_label_new("Character set:"); gtk_container_add(GTK_CONTAINER(string_opt_vb), combo_lb); - gtk_misc_set_alignment(GTK_MISC(combo_lb), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(combo_lb), 0.0f, 0.5f); gtk_widget_show(combo_lb); /* Character Type Selection Dropdown Box diff --git a/gtk/funnel_stat.c b/gtk/funnel_stat.c index 04ac600b1d..e79d405ef1 100644 --- a/gtk/funnel_stat.c +++ b/gtk/funnel_stat.c @@ -432,7 +432,7 @@ static void funnel_new_dialog(const gchar* title, GtkWidget *entry, *label; label = gtk_label_new(fieldname); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(main_tb), label, 0, 1, i+1, i + 2); gtk_widget_show(label); diff --git a/gtk/gsm_map_summary.c b/gtk/gsm_map_summary.c index e55750d8e9..25e7690069 100644 --- a/gtk/gsm_map_summary.c +++ b/gtk/gsm_map_summary.c @@ -66,7 +66,7 @@ add_string_to_box(gchar *str, GtkWidget *box) { GtkWidget *lb; lb = gtk_label_new(str); - gtk_misc_set_alignment(GTK_MISC(lb), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(lb), 0.0f, 0.5f); gtk_box_pack_start(GTK_BOX(box), lb,FALSE,FALSE, 0); gtk_widget_show(lb); } diff --git a/gtk/iax2_analysis.c b/gtk/iax2_analysis.c index 728ed06f66..a6a1755874 100644 --- a/gtk/iax2_analysis.c +++ b/gtk/iax2_analysis.c @@ -2129,7 +2129,7 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_) gtk_table_attach (GTK_TABLE (table1), channels_label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5f); forward_rb = gtk_radio_button_new_with_label (channels_group, "forward "); channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (forward_rb)); @@ -2694,7 +2694,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label_format), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label_format), 0, 0.5f); raw_rb = gtk_radio_button_new_with_label (format_group, ".raw"); format_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (raw_rb)); @@ -2740,7 +2740,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) gtk_table_attach (GTK_TABLE (table1), channels_label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5f); forward_rb = gtk_radio_button_new_with_label (channels_group, "forward "); channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (forward_rb)); diff --git a/gtk/main_menu.c b/gtk/main_menu.c index 45286a34b8..9d87ed5236 100644 --- a/gtk/main_menu.c +++ b/gtk/main_menu.c @@ -2905,7 +2905,7 @@ menu_prefs_edit_dlg (GtkWidget *w, gpointer data) label = gtk_label_new(ep_strdup_printf("%s:", pref->title)); gtk_table_attach_defaults(GTK_TABLE(main_tb), label, 0, 1, 1, 2); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f); if (pref->description) gtk_tooltips_set_tip(tooltips, label, pref->description, NULL); diff --git a/gtk/main_packet_list.c b/gtk/main_packet_list.c index 2859114a62..dbbf086f67 100644 --- a/gtk/main_packet_list.c +++ b/gtk/main_packet_list.c @@ -652,7 +652,7 @@ packet_list_resize_columns(void) bump that value by this amount. */ progbar_quantum = cfile.cinfo.num_cols/N_PROGBAR_UPDATES; /* Progress so far. */ - progbar_val = 0.0; + progbar_val = 0.0f; progbar_stop_flag = FALSE; g_get_current_time(&progbar_start_time); @@ -752,7 +752,7 @@ void packet_list_moveto_end(void) { gtk_clist_moveto(GTK_CLIST(packet_list), - GTK_CLIST(packet_list)->rows - 1, -1, 1.0, 1.0); + GTK_CLIST(packet_list)->rows - 1, -1, 1.0f, 1.0f); } gboolean @@ -890,7 +890,7 @@ packet_list_set_selected_row(gint row) if (!full_visible) { gtk_clist_freeze(GTK_CLIST(packet_list)); - gtk_clist_moveto(GTK_CLIST(packet_list), row, -1, 0.0, 0.0); + gtk_clist_moveto(GTK_CLIST(packet_list), row, -1, 0.0f, 0.0f); /* even after move still invisible (happens with empty list) -> give up */ if(gtk_clist_row_is_visible(GTK_CLIST(packet_list), row) != GTK_VISIBILITY_FULL) { @@ -910,7 +910,7 @@ packet_list_set_selected_row(gint row) visible_rows = packet_list_last_full_visible_row(row) - packet_list_first_full_visible_row(row); first_row = row - visible_rows / 3; - gtk_clist_moveto(GTK_CLIST(packet_list), first_row >= 0 ? first_row : 0, -1, 0.0, 0.0); + gtk_clist_moveto(GTK_CLIST(packet_list), first_row >= 0 ? first_row : 0, -1, 0.0f, 0.0f); gtk_clist_thaw(GTK_CLIST(packet_list)); } diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c index b03fe14c6e..eca178d48d 100644 --- a/gtk/main_proto_draw.c +++ b/gtk/main_proto_draw.c @@ -491,7 +491,7 @@ highlight_field(tvbuff_t *tvb, gint byte, GtkTreeView *tree_view, /* And position the window so the selection is visible. * Position the selection in the middle of the viewable * pane. */ - gtk_tree_view_scroll_to_cell(tree_view, first_path, NULL, TRUE, 0.5, 0.0); + gtk_tree_view_scroll_to_cell(tree_view, first_path, NULL, TRUE, 0.5f, 0.0f); gtk_tree_path_free(first_path); @@ -1028,7 +1028,7 @@ packet_hex_print_common(GtkWidget *bv, const guint8 *pd, int len, int bstart, bump that value by this amount. */ progbar_quantum = len/N_PROGBAR_UPDATES; /* Progress so far. */ - progbar_val = 0.0; + progbar_val = 0.0f; progbar_stop_flag = FALSE; g_get_current_time(&progbar_start_time); diff --git a/gtk/main_welcome.c b/gtk/main_welcome.c index 90e3bae85a..1aa598fa9c 100644 --- a/gtk/main_welcome.c +++ b/gtk/main_welcome.c @@ -226,7 +226,7 @@ welcome_button(const gchar *stock_item, /* title */ w = gtk_label_new(title); - gtk_misc_set_alignment (GTK_MISC(w), 0.0, 0.5); + gtk_misc_set_alignment (GTK_MISC(w), 0.0f, 0.5f); formatted_text = g_strdup_printf("<span weight=\"bold\" size=\"x-large\" foreground=\"black\">%s</span>", title); gtk_label_set_markup(GTK_LABEL(w), formatted_text); g_free(formatted_text); @@ -234,7 +234,7 @@ welcome_button(const gchar *stock_item, /* subtitle */ w = gtk_label_new(subtitle); - gtk_misc_set_alignment (GTK_MISC(w), 0.0, 0.5); + gtk_misc_set_alignment (GTK_MISC(w), 0.0f, 0.5f); formatted_text = g_strdup_printf("<span size=\"small\" foreground=\"black\">%s</span>", subtitle); gtk_label_set_markup(GTK_LABEL(w), formatted_text); g_free(formatted_text); @@ -288,7 +288,7 @@ welcome_header_new(void) w = gtk_label_new(message->str); gtk_label_set_markup(GTK_LABEL(w), message->str); g_string_free(message, TRUE); - gtk_misc_set_alignment (GTK_MISC(w), 0.0, 0.5); + gtk_misc_set_alignment (GTK_MISC(w), 0.0f, 0.5f); gtk_box_pack_start(GTK_BOX(item_hb), w, TRUE, TRUE, 5); gtk_widget_show_all(eb); @@ -462,7 +462,7 @@ main_welcome_add_recent_capture_files(const char *widget_cf_name) w = welcome_filename_link_new(widget_cf_name, &label); gtk_widget_modify_bg(w, GTK_STATE_NORMAL, &topic_item_idle_bg); - gtk_misc_set_alignment (GTK_MISC(label), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC(label), 0.0f, 0.0f); child_box = scroll_box_dynamic_add(welcome_file_panel_vb); gtk_box_pack_start(GTK_BOX(child_box), w, FALSE, FALSE, 0); gtk_widget_show_all(w); @@ -545,7 +545,7 @@ welcome_if_new(const if_info_t *if_info, const gchar *user_descr, GdkColor *topi gtk_label_set_markup(GTK_LABEL(w), message->str); g_string_free(message, TRUE); - gtk_misc_set_alignment (GTK_MISC(w), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC(w), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(interface_hb), w, FALSE, FALSE, 0); return eb; @@ -742,7 +742,7 @@ welcome_new(void) w = gtk_label_new(label_text); gtk_label_set_markup(GTK_LABEL(w), label_text); g_free (label_text); - gtk_misc_set_alignment (GTK_MISC(w), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC(w), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(topic_to_fill), w, FALSE, FALSE, 5); if_child_box = gtk_vbox_new(FALSE, 0); @@ -806,7 +806,7 @@ welcome_new(void) w = gtk_label_new(label_text); gtk_label_set_markup(GTK_LABEL(w), label_text); g_free (label_text); - gtk_misc_set_alignment (GTK_MISC(w), 0.0, 0.0); + gtk_misc_set_alignment (GTK_MISC(w), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(topic_to_fill), w, FALSE, FALSE, 5); file_child_box = gtk_vbox_new(FALSE, 1); diff --git a/gtk/mtp3_stat.c b/gtk/mtp3_stat.c index 11d6f08d55..b00db8981a 100644 --- a/gtk/mtp3_stat.c +++ b/gtk/mtp3_stat.c @@ -324,7 +324,7 @@ mtp3_stat_draw( * : * should generally be preferred when inserting rows in a sorted list store. */ - avg = 0.0; + avg = 0.0f; if ((*stat_p)[i].si_code[j].num_msus !=0){ avg = (float)(*stat_p)[i].si_code[j].size/(float)(*stat_p)[i].si_code[j].num_msus; } diff --git a/gtk/mtp3_summary.c b/gtk/mtp3_summary.c index 7d90594ce8..d6eb82f63b 100644 --- a/gtk/mtp3_summary.c +++ b/gtk/mtp3_summary.c @@ -207,7 +207,7 @@ add_string_to_box(gchar *str, GtkWidget *box) { GtkWidget *lb; lb = gtk_label_new(str); - gtk_misc_set_alignment(GTK_MISC(lb), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(lb), 0.0f, 0.5f); gtk_box_pack_start(GTK_BOX(box), lb,FALSE,FALSE, 0); gtk_widget_show(lb); } diff --git a/gtk/prefs_capture.c b/gtk/prefs_capture.c index 222cad93b7..17a549a9db 100644 --- a/gtk/prefs_capture.c +++ b/gtk/prefs_capture.c @@ -111,7 +111,7 @@ capture_prefs_show(void) /* Default device */ if_lb = gtk_label_new("Default interface:"); gtk_table_attach_defaults(GTK_TABLE(main_tb), if_lb, 0, 1, row, row+1); - gtk_misc_set_alignment(GTK_MISC(if_lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_lb), 1.0f, 0.5f); gtk_widget_show(if_lb); if_cb = gtk_combo_new(); @@ -138,7 +138,7 @@ capture_prefs_show(void) /* Interface properties */ ifopts_lb = gtk_label_new("Interfaces:"); gtk_table_attach_defaults(GTK_TABLE(main_tb), ifopts_lb, 0, 1, row, row+1); - gtk_misc_set_alignment(GTK_MISC(ifopts_lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(ifopts_lb), 1.0f, 0.5f); gtk_widget_show(ifopts_lb); ifopts_bt = gtk_button_new_from_stock(WIRESHARK_STOCK_EDIT); @@ -331,29 +331,29 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_) if_dev_lb = gtk_label_new("Device:"); gtk_table_attach_defaults(GTK_TABLE(main_tb), if_dev_lb, 0, 1, row, row+1); - gtk_misc_set_alignment(GTK_MISC(if_dev_lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_dev_lb), 1.0f, 0.5f); gtk_widget_show(if_dev_lb); if_dev_lb = gtk_label_new(""); gtk_table_attach_defaults(GTK_TABLE(main_tb), if_dev_lb, 1, 2, row, row+1); - gtk_misc_set_alignment(GTK_MISC(if_dev_lb), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_dev_lb), 0.0f, 0.5f); gtk_widget_show(if_dev_lb); row++; if_name_lb = gtk_label_new("Description:"); gtk_table_attach_defaults(GTK_TABLE(main_tb), if_name_lb, 0, 1, row, row+1); - gtk_misc_set_alignment(GTK_MISC(if_name_lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_name_lb), 1.0f, 0.5f); gtk_widget_show(if_name_lb); if_name_lb = gtk_label_new(""); gtk_table_attach_defaults(GTK_TABLE(main_tb), if_name_lb, 1, 2, row, row+1); - gtk_misc_set_alignment(GTK_MISC(if_name_lb), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_name_lb), 0.0f, 0.5f); gtk_widget_show(if_name_lb); row++; if_linktype_lb = gtk_label_new("Default link-layer header type:"); gtk_table_attach_defaults(GTK_TABLE(main_tb), if_linktype_lb, 0, 1, row, row+1); - gtk_misc_set_alignment(GTK_MISC(if_name_lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_name_lb), 1.0f, 0.5f); gtk_widget_show(if_linktype_lb); if_linktype_cb = gtk_combo_box_new_text(); @@ -368,7 +368,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_) /* create interface description label and text entry */ if_descr_lb = gtk_label_new("Comment:"); gtk_table_attach_defaults(GTK_TABLE(main_tb), if_descr_lb, 0, 1, row, row+1); - gtk_misc_set_alignment(GTK_MISC(if_descr_lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_descr_lb), 1.0f, 0.5f); gtk_widget_show(if_descr_lb); if_descr_te = gtk_entry_new(); @@ -382,7 +382,7 @@ ifopts_edit_cb(GtkWidget *w, gpointer data _U_) /* create hide interface label and button */ if_hide_lb = gtk_label_new("Hide interface?:"); gtk_table_attach_defaults(GTK_TABLE(main_tb), if_hide_lb, 0, 1, row, row+1); - gtk_misc_set_alignment(GTK_MISC(if_hide_lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(if_hide_lb), 1.0f, 0.5f); gtk_widget_show(if_hide_lb); if_hide_cb = gtk_check_button_new(); diff --git a/gtk/prefs_column.c b/gtk/prefs_column.c index 518774d2bb..32a70a7e90 100644 --- a/gtk/prefs_column.c +++ b/gtk/prefs_column.c @@ -193,7 +193,7 @@ column_prefs_show(GtkWidget *prefs_window) { gtk_widget_show(tb); lb = gtk_label_new("Format:"); - gtk_misc_set_alignment(GTK_MISC(lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(lb), 1.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(tb), lb, 0, 1, 0, 1); gtk_widget_show(lb); @@ -203,7 +203,7 @@ column_prefs_show(GtkWidget *prefs_window) { gtk_widget_show(props_hb); field_lb = gtk_label_new("Field name:"); - gtk_misc_set_alignment(GTK_MISC(field_lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(field_lb), 1.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(tb), field_lb, 2, 3, 0, 1); gtk_widget_hide(field_lb); diff --git a/gtk/prefs_dlg.c b/gtk/prefs_dlg.c index a7fdde19f5..8590fa9f62 100644 --- a/gtk/prefs_dlg.c +++ b/gtk/prefs_dlg.c @@ -633,7 +633,7 @@ set_option_label(GtkWidget *main_tb, int table_position, GtkWidget *event_box; label = gtk_label_new(label_text); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f); gtk_widget_show(label); event_box = gtk_event_box_new(); @@ -1653,7 +1653,7 @@ tree_select_node(GtkWidget *tree, prefs_tree_iter *iter) /* And position the window so the selection is visible. * Position the selection in the middle of the viewable * pane. */ - gtk_tree_view_scroll_to_cell(tree_view, first_path, NULL, TRUE, 0.5, 0.0); + gtk_tree_view_scroll_to_cell(tree_view, first_path, NULL, TRUE, 0.5f, 0.0f); gtk_tree_path_free(first_path); } diff --git a/gtk/prefs_layout.c b/gtk/prefs_layout.c index b7aa58317f..7a7893cfc6 100644 --- a/gtk/prefs_layout.c +++ b/gtk/prefs_layout.c @@ -85,7 +85,7 @@ static GtkWidget *layout_content_radio_vbox(GtkWidget *main_vb, GtkTooltips *too g_snprintf (buf, sizeof(buf), "Pane %d:", i); radio_lb = gtk_label_new(buf); - gtk_misc_set_alignment(GTK_MISC(radio_lb), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(radio_lb), 0.0f, 0.5f); gtk_container_add(GTK_CONTAINER(radio_vb), radio_lb); radio_none_rb = gtk_radio_button_new_with_mnemonic_from_widget(NULL, "None"); diff --git a/gtk/prefs_stream.c b/gtk/prefs_stream.c index ddc4e64f8d..5368ea4434 100644 --- a/gtk/prefs_stream.c +++ b/gtk/prefs_stream.c @@ -97,7 +97,7 @@ stream_prefs_show() gtk_widget_show(main_tb); label = gtk_label_new("Set:"); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(main_tb), label, 0, 1, 0, 1); gtk_widget_show(label); diff --git a/gtk/print_dlg.c b/gtk/print_dlg.c index e597d298b7..0a6f5b0224 100644 --- a/gtk/print_dlg.c +++ b/gtk/print_dlg.c @@ -628,7 +628,7 @@ open_print_dialog(const char *title, output_action_e action, print_args_t *args) #ifndef _WIN32 cmd_lb = gtk_label_new("Print command:"); g_object_set_data(G_OBJECT(dest_cb), PRINT_CMD_LB_KEY, cmd_lb); - gtk_misc_set_alignment(GTK_MISC(cmd_lb), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(cmd_lb), 1.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(printer_tb), cmd_lb, 0, 1, 1, 2); gtk_widget_set_sensitive(cmd_lb, !args->to_file); if(action == output_action_print) diff --git a/gtk/progress_dlg.c b/gtk/progress_dlg.c index 774a841160..42e4db39c3 100644 --- a/gtk/progress_dlg.c +++ b/gtk/progress_dlg.c @@ -119,19 +119,19 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title, static_vb = gtk_vbox_new(FALSE, 1); task_title_dup = g_strdup_printf ("%s:", task_title); tmp_lb = gtk_label_new(task_title_dup); - gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0f, 0.0f); gtk_box_pack_start(GTK_BOX(static_vb), tmp_lb, FALSE, TRUE, 3); tmp_lb = gtk_label_new("Status:"); - gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0f, 0.0f); gtk_box_pack_start(GTK_BOX(static_vb), tmp_lb, FALSE, TRUE, 3); tmp_lb = gtk_label_new("Elapsed Time:"); - gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0f, 0.0f); gtk_box_pack_start(GTK_BOX(static_vb), tmp_lb, FALSE, TRUE, 3); tmp_lb = gtk_label_new("Time Left:"); - gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0f, 0.0f); gtk_box_pack_start(GTK_BOX(static_vb), tmp_lb, FALSE, TRUE, 3); tmp_lb = gtk_label_new("Progress:"); - gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(tmp_lb), 1.0f, 0.0f); gtk_box_pack_start(GTK_BOX(static_vb), tmp_lb, FALSE, TRUE, 3); @@ -147,27 +147,27 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title, */ title_lb = gtk_label_new(item_title_dup); gtk_box_pack_start(GTK_BOX(dynamic_vb), title_lb, FALSE, TRUE, 3); - gtk_misc_set_alignment(GTK_MISC(title_lb), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(title_lb), 0.0f, 0.0f); gtk_misc_set_padding(GTK_MISC(title_lb), 0, 0); /* same for "Status" */ status_lb = gtk_label_new(""); gtk_box_pack_start(GTK_BOX(dynamic_vb), status_lb, FALSE, TRUE, 3); - gtk_misc_set_alignment(GTK_MISC(status_lb), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(status_lb), 0.0f, 0.0f); gtk_misc_set_padding(GTK_MISC(status_lb), 0, 0); dlg->status_lb = (GtkLabel *) status_lb; /* same for "Elapsed Time" */ elapsed_lb = gtk_label_new("00:00"); gtk_box_pack_start(GTK_BOX(dynamic_vb), elapsed_lb, FALSE, TRUE, 3); - gtk_misc_set_alignment(GTK_MISC(elapsed_lb), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(elapsed_lb), 0.0f, 0.0f); gtk_misc_set_padding(GTK_MISC(elapsed_lb), 0, 0); dlg->elapsed_lb = (GtkLabel *) elapsed_lb; /* same for "Time Left" */ time_left_lb = gtk_label_new("--:--"); gtk_box_pack_start(GTK_BOX(dynamic_vb), time_left_lb, FALSE, TRUE, 3); - gtk_misc_set_alignment(GTK_MISC(time_left_lb), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(time_left_lb), 0.0f, 0.0f); gtk_misc_set_padding(GTK_MISC(time_left_lb), 0, 0); dlg->time_left_lb = (GtkLabel *) time_left_lb; @@ -182,7 +182,7 @@ create_progress_dlg(const gchar *task_title, const gchar *item_title, gtk_box_pack_start(GTK_BOX(percentage_hb), prog_bar, FALSE, TRUE, 3); percentage_lb = gtk_label_new(" 0%"); - gtk_misc_set_alignment(GTK_MISC(percentage_lb), 0.0, 0.0); + gtk_misc_set_alignment(GTK_MISC(percentage_lb), 0.0f, 0.0f); gtk_box_pack_start(GTK_BOX(percentage_hb), percentage_lb, FALSE, TRUE, 3); dlg->percentage_lb = (GtkLabel *) percentage_lb; diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c index 3efb22c97f..00aa078c65 100644 --- a/gtk/proto_dlg.c +++ b/gtk/proto_dlg.c @@ -156,7 +156,7 @@ proto_cb(GtkWidget *w _U_, gpointer data _U_) label = gtk_label_new("Disabling a protocol prevents higher " "layer protocols from being displayed"); - gtk_misc_set_alignment(GTK_MISC(label), 0.5, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.5f, 0.5f); gtk_widget_show(label); gtk_box_pack_start(GTK_BOX(proto_vb), label, FALSE, FALSE, 5); diff --git a/gtk/rtp_analysis.c b/gtk/rtp_analysis.c index 5f7ada8c68..d59c78541b 100644 --- a/gtk/rtp_analysis.c +++ b/gtk/rtp_analysis.c @@ -2112,7 +2112,7 @@ static void save_csv_as_cb(GtkWidget *bt _U_, user_data_t *user_data _U_) gtk_table_attach (GTK_TABLE (table1), channels_label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5f); forward_rb = gtk_radio_button_new_with_label (channels_group, "forward "); channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (forward_rb)); @@ -2690,7 +2690,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (label_format), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (label_format), 0, 0.5f); raw_rb = gtk_radio_button_new_with_label (format_group, ".raw"); format_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (raw_rb)); @@ -2735,7 +2735,7 @@ static void on_save_bt_clicked(GtkWidget *bt _U_, user_data_t *user_data _U_) gtk_table_attach (GTK_TABLE (table1), channels_label, 0, 1, 1, 2, (GtkAttachOptions) (GTK_FILL), (GtkAttachOptions) (0), 0, 0); - gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5); + gtk_misc_set_alignment (GTK_MISC (channels_label), 0, 0.5f); forward_rb = gtk_radio_button_new_with_label (channels_group, "forward "); channels_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (forward_rb)); diff --git a/gtk/rtp_stream_dlg.c b/gtk/rtp_stream_dlg.c index 6589ec2fe1..516da643b3 100644 --- a/gtk/rtp_stream_dlg.c +++ b/gtk/rtp_stream_dlg.c @@ -263,7 +263,7 @@ rtpstream_on_findrev (GtkButton *button _U_, row++) { if (rtp_stream_info_cmp_reverse(selected_stream_fwd, pstream) == 0) { gtk_clist_select_row(GTK_CLIST(clist), row, 0); - gtk_clist_moveto(GTK_CLIST(clist), row, 0, 0.5, 0); + gtk_clist_moveto(GTK_CLIST(clist), row, 0, 0.5f, 0); return; } } @@ -274,7 +274,7 @@ rtpstream_on_findrev (GtkButton *button _U_, row++) { if (rtp_stream_info_cmp_reverse(selected_stream_fwd, pstream) == 0) { gtk_clist_select_row(GTK_CLIST(clist), row, 0); - gtk_clist_moveto(GTK_CLIST(clist), row, 0, 0.5, 0); + gtk_clist_moveto(GTK_CLIST(clist), row, 0, 0.5f, 0); return; } } @@ -282,7 +282,7 @@ rtpstream_on_findrev (GtkButton *button _U_, /* if we didnt find another stream, highlight the current reverse stream */ if (selected_stream_rev!=NULL) { gtk_clist_select_row(GTK_CLIST(clist), row, 0); - gtk_clist_moveto(GTK_CLIST(clist), row, 0, 0.5, 0); + gtk_clist_moveto(GTK_CLIST(clist), row, 0, 0.5f, 0); } } diff --git a/gtk/sctp_chunk_stat_dlg.c b/gtk/sctp_chunk_stat_dlg.c index 0c89db62db..271f933f17 100644 --- a/gtk/sctp_chunk_stat_dlg.c +++ b/gtk/sctp_chunk_stat_dlg.c @@ -547,16 +547,16 @@ static void sctp_chunk_dlg(struct sctp_udata *u_data) row = 0; label = gtk_label_new("ChunkType"); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, row, row+1); label = gtk_label_new("Association"); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, row, row+1); label = gtk_label_new("Endpoint 1"); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 2, 3, row, row+1); label = gtk_label_new("Endpoint 2"); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 3, 4, row, row+1); row ++; label = gtk_label_new(""); @@ -572,37 +572,37 @@ static void sctp_chunk_dlg(struct sctp_udata *u_data) for (i=0; i<NUM_CHUNKS-1; i++) { label = gtk_label_new(chunk_name(i)); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, row, row+1); g_snprintf(label_txt, 10, "%u", selected_stream->chunk_count[i]); label = gtk_label_new(label_txt); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, row, row+1); g_snprintf(label_txt, 10, "%u", selected_stream->ep1_chunk_count[i]); label = gtk_label_new(label_txt); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 2, 3, row, row+1); g_snprintf(label_txt, 10, "%u", selected_stream->ep2_chunk_count[i]); label = gtk_label_new(label_txt); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 3, 4, row, row+1); row ++; } label = gtk_label_new("Others"); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 0, 1, row, row+1); g_snprintf(label_txt, 10, "%u", selected_stream->chunk_count[12]); label = gtk_label_new(label_txt); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 1, 2, row, row+1); g_snprintf(label_txt, 10, "%u", selected_stream->ep1_chunk_count[12]); label = gtk_label_new(label_txt); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 2, 3, row, row+1); g_snprintf(label_txt, 10, "%u", selected_stream->ep2_chunk_count[12]); label = gtk_label_new(label_txt); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(table), label, 3, 4, row, row+1); h_button_box=gtk_hbutton_box_new(); diff --git a/gtk/simple_dialog.c b/gtk/simple_dialog.c index 66a36bda68..6b01b1e65a 100644 --- a/gtk/simple_dialog.c +++ b/gtk/simple_dialog.c @@ -157,7 +157,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message) pixmap = gdk_pixmap_colormap_create_from_xpm_d(NULL, cmap, &mask, &style->bg[GTK_STATE_NORMAL], (gchar **) icon); type_pm = gtk_pixmap_new(pixmap, mask); - gtk_misc_set_alignment (GTK_MISC (type_pm), 0.5, 0.0); + gtk_misc_set_alignment (GTK_MISC (type_pm), 0.5f, 0.0f); gtk_container_add(GTK_CONTAINER(top_hb), type_pm); gtk_widget_show(type_pm); @@ -178,7 +178,7 @@ display_simple_dialog(gint type, gint btn_mask, char *message) #endif gtk_label_set_justify(GTK_LABEL(msg_label), GTK_JUSTIFY_FILL); - gtk_misc_set_alignment (GTK_MISC (type_pm), 0.5, 0.0); + gtk_misc_set_alignment (GTK_MISC (type_pm), 0.5f, 0.0f); gtk_container_add(GTK_CONTAINER(msg_vb), msg_label); gtk_label_set_line_wrap(GTK_LABEL(msg_label), TRUE); gtk_widget_show(msg_label); diff --git a/gtk/sip_stat.c b/gtk/sip_stat.c index a92ddf0f68..4fb7b4da51 100644 --- a/gtk/sip_stat.c +++ b/gtk/sip_stat.c @@ -220,7 +220,7 @@ sip_draw_hash_requests(gchar *key _U_ , sip_request_method_t *data, gchar * unus { /* Create new label */ data->widget=gtk_label_new(string_buff); - gtk_misc_set_alignment(GTK_MISC(data->widget), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(data->widget), 0.0f, 0.5f); gtk_box_pack_start(GTK_BOX(data->sp->request_box), data->widget,FALSE,FALSE, 0); gtk_widget_show(data->widget); } diff --git a/gtk/summary_dlg.c b/gtk/summary_dlg.c index 408ef196a1..d6df9b6b92 100644 --- a/gtk/summary_dlg.c +++ b/gtk/summary_dlg.c @@ -75,12 +75,12 @@ add_string_to_table_sensitive(GtkWidget *list, guint *row, const gchar *title, c g_free (message); } g_free(indent); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_widget_set_sensitive(label, sensitive); gtk_table_attach_defaults(GTK_TABLE(list), label, 0, 1, *row, *row+1); label = gtk_label_new(value); - gtk_misc_set_alignment(GTK_MISC(label), 0.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f); gtk_widget_set_sensitive(label, sensitive); gtk_table_attach_defaults(GTK_TABLE(list), label, 1, 2, *row, *row+1); diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c index 7463b4ad49..8d55a6dd51 100644 --- a/gtk/uat_gui.c +++ b/gtk/uat_gui.c @@ -449,7 +449,7 @@ static void uat_edit_dialog(uat_t* uat, gint row) { if (f[colnum].desc != NULL) gtk_tooltips_set_tip(tooltips, event_box, f[colnum].desc, NULL); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(main_tb), event_box, 0, 1, colnum+1, colnum + 2); gtk_container_add(GTK_CONTAINER(event_box), label); @@ -579,11 +579,11 @@ static void uat_del_dlg(uat_t* uat, int idx) { char* text = fld_tostr(rec,&(f[colnum])); label = gtk_label_new(ep_strdup_printf("%s:", f[colnum].title)); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(main_tb), label, 0, 1, colnum+1, colnum + 2); label = gtk_label_new(text); - gtk_misc_set_alignment(GTK_MISC(label), 1.0, 0.5); + gtk_misc_set_alignment(GTK_MISC(label), 1.0f, 0.5f); gtk_table_attach_defaults(GTK_TABLE(main_tb), label, 1, 2, colnum+1, colnum + 2); } diff --git a/gtk/wlan_stat_dlg.c b/gtk/wlan_stat_dlg.c index 49b8783a64..be4a380545 100644 --- a/gtk/wlan_stat_dlg.c +++ b/gtk/wlan_stat_dlg.c @@ -489,7 +489,7 @@ wlanstat_details(wlanstat_t *hs, wlan_ep_t *wlan_ep, gboolean clear) if ((wlan_ep->number_of_packets - wlan_ep->type[0x08]) > 0) { f = (float)(((float)tmp->number_of_packets * 100.0) / (wlan_ep->number_of_packets - wlan_ep->type[0x08])); } else { - f = 0.0; + f = 0.0f; } if (hs->resolve_names) { diff --git a/proto_hier_stats.c b/proto_hier_stats.c index 40651fc6ae..77d3534441 100644 --- a/proto_hier_stats.c +++ b/proto_hier_stats.c @@ -206,7 +206,7 @@ ph_stats_new(void) /* Count of packets at which we've looked. */ count = 0; /* Progress so far. */ - progbar_val = 0.0; + progbar_val = 0.0f; stop_flag = FALSE; g_get_current_time(&start_time); |