Author: cazfi
Date: Mon Jan 2 20:20:52 2017
New Revision: 34777
URL: http://svn.gna.org/viewcvs/freeciv?rev=34777&view=rev
Log:
Deprecated compresstype bzip2.
See patch #7112
Modified:
trunk/server/settings.c
Modified: trunk/server/settings.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/settings.c?rev=34777&r1=34776&r2=34777&view=diff
==============================================================================
--- trunk/server/settings.c (original)
+++ trunk/server/settings.c Mon Jan 2 20:20:52 2017
@@ -529,7 +529,7 @@
NAME_CASE(FZ_ZLIB, "LIBZ", N_("Using zlib (gzip format)"));
#endif
#ifdef FREECIV_HAVE_LIBBZ2
- NAME_CASE(FZ_BZIP2, "BZIP2", N_("Using bzip2"));
+ NAME_CASE(FZ_BZIP2, "BZIP2", N_("Using bzip2 (deprecated)"));
#endif
#ifdef FREECIV_HAVE_LIBLZMA
NAME_CASE(FZ_XZ, "XZ", N_("Using xz"));
@@ -1225,6 +1225,22 @@
return FALSE;
}
#endif /* FREECIV_WEB */
+
+ return TRUE;
+}
+
+/*************************************************************************
+ Warn about deprecated compresstype selection.
+*************************************************************************/
+static bool compresstype_callback(int value,
+ struct connection *caller,
+ char *reject_msg,
+ size_t reject_msg_len)
+{
+ if (value == FZ_BZIP2) {
+ log_warn(_("Bzip2 is deprecated as compresstype. Consider "
+ "other options."));
+ }
return TRUE;
}
@@ -2818,7 +2834,7 @@
SSET_META, SSET_INTERNAL, SSET_RARE, ALLOW_HACK, ALLOW_HACK,
N_("Savegame compression algorithm"),
N_("Compression library to use for savegames."),
- NULL, NULL, NULL, compresstype_name, GAME_DEFAULT_COMPRESS_TYPE)
+ NULL, compresstype_callback, NULL, compresstype_name,
GAME_DEFAULT_COMPRESS_TYPE)
GEN_STRING("savename", game.server.save_name,
SSET_META, SSET_INTERNAL, SSET_VITAL, ALLOW_HACK, ALLOW_HACK,
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
