Author: sveinung
Date: Fri Jan 29 15:22:21 2016
New Revision: 31677
URL: http://svn.gna.org/viewcvs/freeciv?rev=31677&view=rev
Log:
option_get_cb_data(): don't return NULL.
The function option_get_cb_data() should return an integer. Fix its input
validating assert so it returns 0 rather than NULL. (The 2.6 version of
option_get_cb_data() returns 0)
See bug #24358
Modified:
trunk/client/options.c
Modified: trunk/client/options.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/options.c?rev=31677&r1=31676&r2=31677&view=diff
==============================================================================
--- trunk/client/options.c (original)
+++ trunk/client/options.c Fri Jan 29 15:22:21 2016
@@ -713,7 +713,7 @@
****************************************************************************/
int option_get_cb_data(const struct option *poption)
{
- fc_assert_ret_val(NULL != poption, NULL);
+ fc_assert_ret_val(NULL != poption, 0);
return poption->callback_data;
}
_______________________________________________
Freeciv-commits mailing list
[email protected]
https://mail.gna.org/listinfo/freeciv-commits
