Author: cazfi
Date: Sat Apr  2 10:07:24 2016
New Revision: 32291

URL: http://svn.gna.org/viewcvs/freeciv?rev=32291&view=rev
Log:
Fixed erronous deprecation warning about 'prefered' instead of 'preferred' in 
game.ruleset
entry names when neither entry is present.

See bug #24542

Modified:
    trunk/server/ruleset.c

Modified: trunk/server/ruleset.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=32291&r1=32290&r2=32291&view=diff
==============================================================================
--- trunk/server/ruleset.c      (original)
+++ trunk/server/ruleset.c      Sat Apr  2 10:07:24 2016
@@ -5331,7 +5331,7 @@
 
   /* section: tileset */
   pref_text = secfile_lookup_str_default(file, "", "tileset.prefered");
-  if (pref_text != NULL) {
+  if (pref_text[0] != '\0') {
     log_deprecation("Entry tileset.prefered in game.ruleset."
                     " Use correct spelling tileset.preferred instead");
   }
@@ -5346,7 +5346,7 @@
 
   /* section: soundset */
   pref_text = secfile_lookup_str_default(file, "", "soundset.prefered");
-  if (pref_text != NULL) {
+  if (pref_text[0] != '\0') {
     log_deprecation("Entry soundset.prefered in game.ruleset."
                     " Use correct spelling soundset.preferred instead");
   }
@@ -5361,7 +5361,7 @@
 
   /* section: musicset */
   pref_text = secfile_lookup_str_default(file, "", "musicset.prefered");
-  if (pref_text != NULL) {
+  if (pref_text[0] != '\0') {
     log_deprecation("Entry musicset.prefered in game.ruleset."
                     " Use correct spelling musicset.preferred instead");
   }


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to