Author: cazfi Date: Mon Apr 11 17:04:47 2016 New Revision: 32355 URL: http://svn.gna.org/viewcvs/freeciv?rev=32355&view=rev Log: Fixed clang compile error caused by redundant check if address of statically allocated string is NULL.
See bug #24566 Modified: trunk/server/meta.c Modified: trunk/server/meta.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/meta.c?rev=32355&r1=32354&r2=32355&view=diff ============================================================================== --- trunk/server/meta.c (original) +++ trunk/server/meta.c Mon Apr 11 17:04:47 2016 @@ -1,4 +1,4 @@ -/********************************************************************** +/********************************************************************** Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -132,12 +132,11 @@ } /************************************************************************* - The metaserver message set by user + The metaserver message set by user *************************************************************************/ const char *get_user_meta_message_string(void) { - if (game.server.meta_info.user_message - && game.server.meta_info.user_message[0] != '\0') { + if (game.server.meta_info.user_message[0] != '\0') { return game.server.meta_info.user_message; } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits