Author: pepeto Date: Tue Jan 13 16:24:49 2015 New Revision: 27660 URL: http://svn.gna.org/viewcvs/freeciv?rev=27660&view=rev Log: Add missing semicolon after fc_assert_XXX() usage.
See gna patch #5695 Modified: branches/S2_6/ai/default/aisettler.c branches/S2_6/client/gui-gtk-2.0/diplodlg.c branches/S2_6/client/gui-gtk-3.0/diplodlg.c branches/S2_6/server/advisors/infracache.c Modified: branches/S2_6/ai/default/aisettler.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/ai/default/aisettler.c?rev=27660&r1=27659&r2=27660&view=diff ============================================================================== --- branches/S2_6/ai/default/aisettler.c (original) +++ branches/S2_6/ai/default/aisettler.c Tue Jan 13 16:24:49 2015 @@ -285,7 +285,7 @@ struct cityresult *result; fc_assert_ret_val(ai != NULL, NULL); - fc_assert_ret_val(ptile != NULL, NULL) + fc_assert_ret_val(ptile != NULL, NULL); pplayer->government = adv->goal.govt.gov; @@ -542,7 +542,7 @@ fc_assert_ret(ai != NULL); fc_assert_ret(ai->settler != NULL); fc_assert_ret(ai->settler->tdc_hash != NULL); - fc_assert_ret(ptdc) + fc_assert_ret(ptdc != NULL); #ifdef DEBUG ai->settler->cache.save++; Modified: branches/S2_6/client/gui-gtk-2.0/diplodlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-2.0/diplodlg.c?rev=27660&r1=27659&r2=27660&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-2.0/diplodlg.c (original) +++ branches/S2_6/client/gui-gtk-2.0/diplodlg.c Tue Jan 13 16:24:49 2015 @@ -207,7 +207,7 @@ if (player_by_number(initiated_from) == client.conn.playing) { /* we have to raise the diplomacy meeting tab as well as the selected * meeting. */ - fc_assert_ret(dipl_main) + fc_assert_ret(dipl_main != NULL); gui_dialog_raise(dipl_main->dialog); gui_dialog_raise(pdialog->dialog); Modified: branches/S2_6/client/gui-gtk-3.0/diplodlg.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-gtk-3.0/diplodlg.c?rev=27660&r1=27659&r2=27660&view=diff ============================================================================== --- branches/S2_6/client/gui-gtk-3.0/diplodlg.c (original) +++ branches/S2_6/client/gui-gtk-3.0/diplodlg.c Tue Jan 13 16:24:49 2015 @@ -207,7 +207,7 @@ if (player_by_number(initiated_from) == client.conn.playing) { /* we have to raise the diplomacy meeting tab as well as the selected * meeting. */ - fc_assert_ret(dipl_main) + fc_assert_ret(dipl_main != NULL); gui_dialog_raise(dipl_main->dialog); gui_dialog_raise(pdialog->dialog); Modified: branches/S2_6/server/advisors/infracache.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/advisors/infracache.c?rev=27660&r1=27659&r2=27660&view=diff ============================================================================== --- branches/S2_6/server/advisors/infracache.c (original) +++ branches/S2_6/server/advisors/infracache.c Tue Jan 13 16:24:49 2015 @@ -63,7 +63,7 @@ int goodness; struct terrain *old_terrain, *new_terrain; - fc_assert_ret_val(ptile != NULL, -1) + fc_assert_ret_val(ptile != NULL, -1); old_terrain = tile_terrain(ptile); new_terrain = old_terrain->irrigation_result; @@ -143,7 +143,7 @@ int goodness; struct terrain *old_terrain, *new_terrain; - fc_assert_ret_val(ptile != NULL, -1) + fc_assert_ret_val(ptile != NULL, -1); old_terrain = tile_terrain(ptile); new_terrain = old_terrain->mining_result; @@ -225,7 +225,7 @@ struct tile *vtile; struct terrain *old_terrain, *new_terrain; - fc_assert_ret_val(ptile != NULL, -1) + fc_assert_ret_val(ptile != NULL, -1); old_terrain = tile_terrain(ptile); new_terrain = old_terrain->transform_result; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits