Author: sveinung
Date: Mon Mar 20 11:34:10 2017
New Revision: 35132
URL: http://svn.gna.org/viewcvs/freeciv?rev=35132&view=rev
Log:
Assert that value isn't ACTION_COUNT.
Add assertions to switch cases that shouldn't end up handling ACTION_COUNT.
See hrm Feature #645814
Modified:
trunk/server/advisors/advdata.c
trunk/server/unithand.c
Modified: trunk/server/advisors/advdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/advisors/advdata.c?rev=35132&r1=35131&r2=35132&view=diff
==============================================================================
--- trunk/server/advisors/advdata.c (original)
+++ trunk/server/advisors/advdata.c Mon Mar 20 11:34:10 2017
@@ -895,6 +895,7 @@
case ACTION_COUNT:
/* Invalid */
+ fc_assert(act != ACTION_COUNT);
break;
}
} action_iterate_end;
Modified: trunk/server/unithand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/unithand.c?rev=35132&r1=35131&r2=35132&view=diff
==============================================================================
--- trunk/server/unithand.c (original)
+++ trunk/server/unithand.c Mon Mar 20 11:34:10 2017
@@ -602,6 +602,7 @@
break;
case ACTION_COUNT:
/* Invalid. */
+ fc_assert(act != ACTION_COUNT);
break;
}
_______________________________________________
Freeciv-commits mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
