From a1b1904660544af58a4a00ca6ad6c22c54f24d73 Mon Sep 17 00:00:00 2001 From: gunnar_g Date: Mon, 23 Mar 2009 13:20:59 +0000 Subject: [PATCH] fix compiler warnings --- src/game_gui.c | 4 ++-- src/main.c | 2 +- src/misc_callback_func.c | 2 +- src/player.c | 2 +- src/transfer.c | 12 ++++++------ src/treeview.c | 3 ++- src/xml_loadsave_users.c | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/game_gui.c b/src/game_gui.c index 37920ae3..2cd39b62 100644 --- a/src/game_gui.c +++ b/src/game_gui.c @@ -584,7 +584,7 @@ game_gui_print_message_source(gpointer data) printf("game_gui_print_message_source\n"); #endif - game_gui_print_message((gchar*)data); + game_gui_print_message((gchar*)data, NULL); g_free(data); @@ -750,7 +750,7 @@ game_gui_show_warning(const gchar *format, ...) if(opt_int("int_opt_prefer_messages") && window.main != NULL) - game_gui_print_message(text); + game_gui_print_message(text, NULL); else { window_create(WINDOW_WARNING); diff --git a/src/main.c b/src/main.c index 85c53adb..4f01443c 100644 --- a/src/main.c +++ b/src/main.c @@ -397,7 +397,7 @@ main_exit_program(gint exit_code, gchar *format, ...) va_start (args, format); g_vsprintf(text, format, args); va_end (args); - g_warning(text); + g_warning(text, NULL); } if(gtk_main_level() > 0) diff --git a/src/misc_callback_func.c b/src/misc_callback_func.c index e508d3e1..d628f829 100644 --- a/src/misc_callback_func.c +++ b/src/misc_callback_func.c @@ -366,7 +366,7 @@ misc_callback_new_sponsor(void) &model, &iter); gtk_tree_model_get(model, &iter, 0, &name, 1, &contract, 2, &benefit, -1); - g_string_printf(current_user.sponsor.name, name); + g_string_printf(current_user.sponsor.name, name, NULL); current_user.sponsor.contract = contract * 4; current_user.sponsor.benefit = benefit; diff --git a/src/player.c b/src/player.c index 7b57a9ee..6c44950a 100644 --- a/src/player.c +++ b/src/player.c @@ -1264,7 +1264,7 @@ player_remove_contract(Player *pl) if(debug < 50) user_event_add(user_from_team(pl->team), EVENT_TYPE_PLAYER_LEFT, -1, -1, NULL, - pl->name); + pl->name, NULL); player_remove_from_team(pl->team, player_id_index(pl->team, pl->id)); } diff --git a/src/transfer.c b/src/transfer.c index 48022822..7daf004b 100644 --- a/src/transfer.c +++ b/src/transfer.c @@ -204,12 +204,12 @@ transfer_offers_notify(Transfer *tr, gboolean sort) if(team_is_user(tr->tm) != -1) user_event_add(user_from_team(tr->tm), EVENT_TYPE_TRANSFER_OFFER_USER, - -1, -1, NULL, player_of_id_team(tr->tm, tr->id)->name); + -1, -1, NULL, player_of_id_team(tr->tm, tr->id)->name, NULL); else user_event_add(user_from_team(off->tm), EVENT_TYPE_TRANSFER_OFFER_CPU, -1, -1, - NULL, player_of_id_team(tr->tm, tr->id)->name); + NULL, player_of_id_team(tr->tm, tr->id)->name, NULL); if(!sort) user_event_show_next(); @@ -248,7 +248,7 @@ transfer_evaluate_offers(void) EVENT_TYPE_TRANSFER_OFFER_REJECTED_FEE_WAGE, transoff(i, j).fee, transoff(i, j).wage, trans(i).tm, - player_of_id_team(trans(i).tm, trans(i).id)->name); + player_of_id_team(trans(i).tm, trans(i).id)->name, NULL); transoff(i, j).status = TRANSFER_OFFER_REJECTED; } else if(player_of_id_team(trans(i).tm, trans(i).id)->value > @@ -259,7 +259,7 @@ transfer_evaluate_offers(void) EVENT_TYPE_TRANSFER_OFFER_REJECTED_FEE, transoff(i, j).fee, transoff(i, j).wage, trans(i).tm, - player_of_id_team(trans(i).tm, trans(i).id)->name); + player_of_id_team(trans(i).tm, trans(i).id)->name, NULL); transoff(i, j).status = TRANSFER_OFFER_REJECTED; } else if(player_of_id_team(trans(i).tm, trans(i).id)->wage > @@ -270,7 +270,7 @@ transfer_evaluate_offers(void) EVENT_TYPE_TRANSFER_OFFER_REJECTED_WAGE, transoff(i, j).fee, transoff(i, j).wage, trans(i).tm, - player_of_id_team(trans(i).tm, trans(i).id)->name); + player_of_id_team(trans(i).tm, trans(i).id)->name, NULL); transoff(i, j).status = TRANSFER_OFFER_REJECTED; } else if(transfer_new_star_balks(&trans(i), &transoff(i, j))) @@ -279,7 +279,7 @@ transfer_evaluate_offers(void) user_from_team(transoff(i, j).tm), EVENT_TYPE_TRANSFER_OFFER_REJECTED_STARS, -1, -1, trans(i).tm, - player_of_id_team(trans(i).tm, trans(i).id)->name); + player_of_id_team(trans(i).tm, trans(i).id)->name, NULL); transoff(i, j).status = TRANSFER_OFFER_REJECTED; } else diff --git a/src/treeview.c b/src/treeview.c index 223c3813..268bbcbb 100644 --- a/src/treeview.c +++ b/src/treeview.c @@ -2708,7 +2708,8 @@ treeview_create_country_list(const GPtrArray *country_list) if (strcmp(previous_element,dir_split_up[j])!=0) { create_new_line=TRUE; - } + } + g_free(previous_element); } // Do we need to create a new element or not if (create_new_line) diff --git a/src/xml_loadsave_users.c b/src/xml_loadsave_users.c index 3dd890dd..f3b45f72 100644 --- a/src/xml_loadsave_users.c +++ b/src/xml_loadsave_users.c @@ -299,7 +299,7 @@ xml_loadsave_users_text (GMarkupParseContext *context, else if(state == TAG_USER_SPONSOR_NAME) { misc_string_replace_token(buf, "AND", "&"); - g_string_printf(new_user.sponsor.name, buf); + g_string_printf(new_user.sponsor.name, buf, NULL); } else if(state == TAG_USER_SPONSOR_CONTRACT) new_user.sponsor.contract = int_value;