Author: cazfi
Date: Mon Apr 20 02:58:09 2015
New Revision: 28818
URL: http://svn.gna.org/viewcvs/freeciv?rev=28818&view=rev
Log:
Fixed warnings from gcc-5 and cppcheck
- Initialize first element of buffers to '\0' before catenating text to them
- Fixed a bug in sdl-clients' where array was referenced via pointer after it
was out-of-scope
- Cleaned out extra "not" from comparisons of boolean effect values
Patch by Per I. Mathisen <per> and myself
See patch #5994
Modified:
trunk/client/gui-gtk-2.0/helpdlg.c
trunk/client/gui-gtk-3.0/helpdlg.c
trunk/client/gui-sdl/graphics.c
trunk/client/gui-sdl2/graphics.c
trunk/client/gui-xaw/helpdlg.c
trunk/common/city.c
trunk/common/improvement.c
trunk/common/unittype.c
Modified: trunk/client/gui-gtk-2.0/helpdlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/helpdlg.c?rev=28818&r1=28817&r2=28818&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/helpdlg.c (original)
+++ trunk/client/gui-gtk-2.0/helpdlg.c Mon Apr 20 02:58:09 2015
@@ -1232,6 +1232,7 @@
create_help_page(HELP_EXTRA);
+ buf[0] = '\0';
if (pextra == NULL) {
strcat(buf, pitem->text);
} else {
Modified: trunk/client/gui-gtk-3.0/helpdlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/helpdlg.c?rev=28818&r1=28817&r2=28818&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/helpdlg.c (original)
+++ trunk/client/gui-gtk-3.0/helpdlg.c Mon Apr 20 02:58:09 2015
@@ -1257,6 +1257,7 @@
create_help_page(HELP_EXTRA);
+ buf[0] = '\0';
if (pextra == NULL) {
strcat(buf, pitem->text);
} else {
Modified: trunk/client/gui-sdl/graphics.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl/graphics.c?rev=28818&r1=28817&r2=28818&view=diff
==============================================================================
--- trunk/client/gui-sdl/graphics.c (original)
+++ trunk/client/gui-sdl/graphics.c Mon Apr 20 02:58:09 2015
@@ -393,6 +393,7 @@
SDL_Color * pColor, bool add_alpha)
{
SDL_Surface *pNew;
+ SDL_Color color = {255, 255, 255, 128};
if (add_alpha) {
pNew = create_surf_alpha(w, h, iFlags);
@@ -406,7 +407,6 @@
if (!pColor) {
/* pColor->unused == ALPHA */
- SDL_Color color ={255, 255, 255, 128};
pColor = &color;
}
Modified: trunk/client/gui-sdl2/graphics.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/graphics.c?rev=28818&r1=28817&r2=28818&view=diff
==============================================================================
--- trunk/client/gui-sdl2/graphics.c (original)
+++ trunk/client/gui-sdl2/graphics.c Mon Apr 20 02:58:09 2015
@@ -410,6 +410,7 @@
SDL_Color *pColor)
{
SDL_Surface *pNew;
+ SDL_Color color = {255, 255, 255, 128};
pNew = create_surf(w, h, iFlags);
@@ -419,8 +420,6 @@
if (!pColor) {
/* pColor->unused == ALPHA */
- SDL_Color color = {255, 255, 255, 128};
-
pColor = &color;
}
Modified: trunk/client/gui-xaw/helpdlg.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-xaw/helpdlg.c?rev=28818&r1=28817&r2=28818&view=diff
==============================================================================
--- trunk/client/gui-xaw/helpdlg.c (original)
+++ trunk/client/gui-xaw/helpdlg.c Mon Apr 20 02:58:09 2015
@@ -1087,6 +1087,7 @@
char buf[4096];
struct extra_type *pextra = extra_type_by_translated_name(title);
+ buf[0] = '\0';
if (pextra == NULL) {
strcat(buf, pitem->text);
} else {
Modified: trunk/common/city.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/city.c?rev=28818&r1=28817&r2=28818&view=diff
==============================================================================
--- trunk/common/city.c (original)
+++ trunk/common/city.c Mon Apr 20 02:58:09 2015
@@ -1934,7 +1934,7 @@
{
int tithes_bonus = 0;
- if (!get_city_bonus(pcity, EFT_HAPPINESS_TO_GOLD) > 0) {
+ if (get_city_bonus(pcity, EFT_HAPPINESS_TO_GOLD) <= 0) {
return 0;
}
Modified: trunk/common/improvement.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/improvement.c?rev=28818&r1=28817&r2=28818&view=diff
==============================================================================
--- trunk/common/improvement.c (original)
+++ trunk/common/improvement.c Mon Apr 20 02:58:09 2015
@@ -608,7 +608,7 @@
}
}
if (space_part &&
- (!get_player_bonus(p, EFT_ENABLE_SPACE) > 0
+ (get_player_bonus(p, EFT_ENABLE_SPACE) <= 0
|| p->spaceship.state >= SSHIP_LAUNCHED)) {
return FALSE;
}
Modified: trunk/common/unittype.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/unittype.c?rev=28818&r1=28817&r2=28818&view=diff
==============================================================================
--- trunk/common/unittype.c (original)
+++ trunk/common/unittype.c Mon Apr 20 02:58:09 2015
@@ -936,7 +936,7 @@
}
if (utype_has_flag(punittype, UTYF_NUCLEAR)
- && !get_player_bonus(p, EFT_ENABLE_NUKE) > 0) {
+ && get_player_bonus(p, EFT_ENABLE_NUKE) <= 0) {
return FALSE;
}
if (utype_has_flag(punittype, UTYF_NOBUILD)) {
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
