Index: client/attribute.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/attribute.c,v retrieving revision 1.9 diff -u -r1.9 attribute.c --- client/attribute.c 2002/03/05 15:46:19 1.9 +++ client/attribute.c 2002/03/06 16:27:28 @@ -247,7 +247,6 @@ "data_length=%d, data=%p)", key, id, x, y, data_length, data); assert(attribute_hash != NULL); - assert(data_length >= 0); pkey = fc_malloc(sizeof(struct attr_key)); pkey->key = key; Index: common/game.h =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/game.h,v retrieving revision 1.99 diff -u -r1.99 game.h --- common/game.h 2002/02/26 16:06:07 1.99 +++ common/game.h 2002/03/06 16:27:33 @@ -367,9 +367,9 @@ #define GAME_MIN_CIVSTYLE 1 #define GAME_MAX_CIVSTYLE 2 -#define GAME_DEFAULT_SCORELOG 0 -#define GAME_MIN_SCORELOG 0 -#define GAME_MAX_SCORELOG 1 +#define GAME_DEFAULT_SCORELOG FALSE +#define GAME_MIN_SCORELOG FALSE +#define GAME_MAX_SCORELOG TRUE #define GAME_DEFAULT_SPACERACE TRUE #define GAME_MIN_SPACERACE FALSE Index: server/report.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/report.c,v retrieving revision 1.25 diff -u -r1.25 report.c --- server/report.c 2002/03/06 03:03:16 1.25 +++ server/report.c 2002/03/06 16:27:39 @@ -641,7 +641,7 @@ { if (!(fgets (line, sizeof (line), fp))) { - if (ferror (fp)) { + if (ferror(fp) != 0) { freelog(LOG_ERROR, "Can't read scorelog file header!"); } else { freelog(LOG_ERROR, "Unterminated scorelog file header!"); @@ -716,7 +716,7 @@ if (oper == SL_UNSPEC) { - if (fseek (fp, -100, SEEK_END)) + if (fseek(fp, -100, SEEK_END) != 0) { freelog (LOG_ERROR, "Can't seek to end of scorelog file!"); @@ -725,7 +725,7 @@ if (!(fgets (line, sizeof (line), fp))) { - if (ferror (fp)) { + if (ferror(fp) != 0) { freelog(LOG_ERROR, "Can't read scorelog file!"); } else { freelog(LOG_ERROR, "Unterminated scorelog file!"); @@ -743,7 +743,7 @@ if (!(fgets (line, sizeof (line), fp))) { - if (ferror (fp)) + if (ferror(fp) != 0) { freelog (LOG_ERROR, "Can't read scorelog file!"); Index: server/savegame.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/savegame.c,v retrieving revision 1.69 diff -u -r1.69 savegame.c --- server/savegame.c 2002/03/06 03:03:17 1.69 +++ server/savegame.c 2002/03/06 16:27:41 @@ -1799,7 +1799,7 @@ game.aifill = secfile_lookup_int_default(file, 0, "game.aifill"); - game.scorelog = secfile_lookup_int_default(file, 0, "game.scorelog"); + game.scorelog = secfile_lookup_bool_default(file, FALSE, "game.scorelog"); game.fogofwar = secfile_lookup_bool_default(file, FALSE, "game.fogofwar"); game.fogofwar_old = game.fogofwar; @@ -2154,7 +2154,7 @@ secfile_insert_int(file, game.save_nturns, "game.save_nturns"); secfile_insert_str(file, game.save_name, "game.save_name"); secfile_insert_int(file, game.aifill, "game.aifill"); - secfile_insert_int(file, game.scorelog, "game.scorelog"); + secfile_insert_bool(file, game.scorelog, "game.scorelog"); secfile_insert_bool(file, game.fogofwar, "game.fogofwar"); secfile_insert_bool(file, game.spacerace, "game.spacerace"); secfile_insert_bool(file, game.auto_ai_toggle, "game.auto_ai_toggle"); Index: server/stdinhand.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/stdinhand.c,v retrieving revision 1.214 diff -u -r1.214 stdinhand.c --- server/stdinhand.c 2002/03/05 10:07:13 1.214 +++ server/stdinhand.c 2002/03/06 16:27:44 @@ -2874,7 +2874,7 @@ return; } - for (; *cptr_s && isspace(*cptr_s); cptr_s++) { + for (; *cptr_s != '\0' && isspace(*cptr_s); cptr_s++) { /* nothing */ } sz_strlcpy(arg, cptr_s);