Hello community,
here is the log from the commit of package bomberclone for openSUSE:Factory
checked in at 2016-06-29 15:10:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bomberclone (Old)
and /work/SRC/openSUSE:Factory/.bomberclone.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "bomberclone"
Changes:
--------
--- /work/SRC/openSUSE:Factory/bomberclone/bomberclone.changes 2015-06-23
11:59:18.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.bomberclone.new/bomberclone.changes
2016-06-29 15:10:34.000000000 +0200
@@ -1,0 +2,7 @@
+Fri Jun 24 16:49:47 UTC 2016 - i...@marguerite.su
+
+- add patch: bomberclone-0.11.9-gcc6.patch
+ * fix boo#985197
+ * fix misleading indentation: 'if' clause does not guard
+
+-------------------------------------------------------------------
New:
----
bomberclone-0.11.9-gcc6.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bomberclone.spec ++++++
--- /var/tmp/diff_new_pack.5SUAGU/_old 2016-06-29 15:10:35.000000000 +0200
+++ /var/tmp/diff_new_pack.5SUAGU/_new 2016-06-29 15:10:35.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package bomberclone
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -31,6 +31,8 @@
Patch3: %{name}-0.11.9-dirs.patch
Patch4: %{name}-0.11.9-libm.patch
Patch5: %{name}-0.11.9-subscript.patch
+#PATCH-FIX-UPSTREAM marguer...@opensuse.org - gcc6 misleading indentation,
'if' clause does not guard
+Patch6: %{name}-0.11.9-gcc6.patch
BuildRequires: automake
BuildRequires: fdupes
BuildRequires: libSDL_image-devel
@@ -49,6 +51,7 @@
%patch3
%patch4
%patch5 -p1
+%patch6 -p1
%build
autoreconf -fi
++++++ bomberclone-0.11.9-gcc6.patch ++++++
Index: b/src/chat.c
===================================================================
--- a/src/chat.c
+++ b/src/chat.c
@@ -75,8 +75,9 @@ chat_drawbox ()
SDL_Rect src;
int i;
- if (gfx_locksurface (gfx.screen))
+ if (gfx_locksurface (gfx.screen)) {
return;
+ }
src = chat.window;
SDL_BlitSurface (chat.oldscreen, NULL, gfx.screen, &src);
Index: b/src/field.c
===================================================================
--- a/src/field.c
+++ b/src/field.c
@@ -180,11 +180,12 @@ draw_stone (int x, int y)
}
// draw explosions if there is any
- for (d = 0; d < 4; d++)
+ for (d = 0; d < 4; d++) {
if (stone->ex[d].count > 0) {
stone_drawfire (x, y, -1);
break;
}
+ }
if (debug) {
char txt[64];
@@ -504,9 +505,10 @@ field_hurrysize ()
/* check if a bomb is at this position, if so let the
bomb explode
and wait untill the explosion is over */
- for (i = 0, d = 0; d < 4; d++)
+ for (i = 0, d = 0; d < 4; d++) {
if
(map.field[fieldhurrypos.x][fieldhurrypos.y].ex[d].count > 0)
- i++;
+ i++;
+ }
get_bomb_on (fieldhurrypos.x, fieldhurrypos.y, bombs);
if (i)
Index: b/src/game.c
===================================================================
--- a/src/game.c
+++ b/src/game.c
@@ -224,13 +224,14 @@ game_loop ()
int done = 0,
eventstate;
- if (GT_MP)
+ if (GT_MP) {
net_game_fillsockaddr ();
if ( SDL_InitSubSystem ( SDL_INIT_JOYSTICK ) < 0 )
{
fprintf ( stderr, "Unable to initialize Joystick: %s\n",
SDL_GetError() );
}
printf ( "%i joysticks found\n", SDL_NumJoysticks () );
+ }
menu = NULL;
bman.updatestatusbar = 1; // force an update
Index: b/src/gfxpixelimage.c
===================================================================
--- a/src/gfxpixelimage.c
+++ b/src/gfxpixelimage.c
@@ -322,12 +322,13 @@ makegray_image (SDL_Surface * org)
}
/* Lock the screen for direct access to the pixels */
- if (SDL_MUSTLOCK (dest))
+ if (SDL_MUSTLOCK (dest)) {
if (SDL_LockSurface (dest) < 0) {
fprintf (stderr, "Can't lock screen: %s\n", SDL_GetError ());
return NULL;
}
- if (SDL_MUSTLOCK (org))
+ }
+ if (SDL_MUSTLOCK (org)) {
if (SDL_LockSurface (org) < 0) {
fprintf (stderr, "Can't lock screen: %s\n", SDL_GetError ());
if (SDL_MUSTLOCK (dest)) {
@@ -335,6 +336,7 @@ makegray_image (SDL_Surface * org)
}
return NULL;
}
+ }
switch (bpp) {
case (2):
Index: b/src/map.c
===================================================================
--- a/src/map.c
+++ b/src/map.c
@@ -214,7 +214,7 @@ map_genmorerandom ()
if (map.size.x > MAX_FIELDSIZE_X)
map.size.x = MAX_FIELDSIZE_X;
- for (x = 0; x < map.size.x; x++)
+ for (x = 0; x < map.size.x; x++) {
for (y = 0; y < map.size.y; y++) {
if ((y == 0) || (y == map.size.y - 1))
map.field[x][y].type = FT_block;
@@ -239,7 +239,8 @@ map_genmorerandom ()
map.field[x][y].frame = 0.0f;
map.field[x][y].special = FT_nothing;
}
-
+ }
+
d_printf("genmorerandom: *** exit ***\n");
/* set the corners of the map to be valid start points */
Index: b/src/mapmenu.c
===================================================================
--- a/src/mapmenu.c
+++ b/src/mapmenu.c
@@ -149,15 +149,19 @@ mapmenu ()
map.map_selection = selmt - &maptypes[0];
}
map.size.x = map.size.x | 1;
- if (map.size.x < MIN_FIELDSIZE_X)
+ if (map.size.x < MIN_FIELDSIZE_X) {
map.size.x = MIN_FIELDSIZE_X;
- if (map.size.x > MAX_FIELDSIZE_X)
+ }
+ if (map.size.x > MAX_FIELDSIZE_X) {
map.size.x = MAX_FIELDSIZE_X;
+ }
map.size.y = map.size.y | 1;
- if (map.size.y < MIN_FIELDSIZE_Y)
+ if (map.size.y < MIN_FIELDSIZE_Y) {
map.size.y = MIN_FIELDSIZE_Y;
- if (map.size.y > MAX_FIELDSIZE_Y)
+ }
+ if (map.size.y > MAX_FIELDSIZE_Y) {
map.size.y = MAX_FIELDSIZE_Y;
+ }
config_write ();
if (GT_MP_PTPM) net_send_servermode ();
Index: b/src/menu.c
===================================================================
--- a/src/menu.c
+++ b/src/menu.c
@@ -219,8 +219,9 @@ menu_draw_menuitem (_menuitem * m)
{
_menu *menu;
- if (m == NULL)
+ if (m == NULL) {
return;
+ }
menu = (_menu *) m->menu;
Index: b/src/netmenu.c
===================================================================
--- a/src/netmenu.c
+++ b/src/netmenu.c
@@ -164,9 +164,10 @@ void host_multiplayer_game () {
bman.p_nr = bman.p_servnr = 0;
team_choose (&players[0]);
players[0].state = PSF_used;
- if (bman.notifygamemaster)
+ if (bman.notifygamemaster) {
send_ogc_update (); /* send the information that we started an
server */
-
+ }
+
multiplayer_game ();
if (bman.notifygamemaster)
Index: b/src/packets.c
===================================================================
--- a/src/packets.c
+++ b/src/packets.c
@@ -1008,8 +1008,9 @@ void do_bombdata (struct pkg_bombdata *b
return;
}
- if (b_dat->state == BS_off)
+ if (b_dat->state == BS_off) {
return; // if there was a bomb let it explose don't
delete the bomb
+ }
d_printf ("do_bombdata [%f,%f] Player: %d PlayerIgnition: %d Bomb: %d,
ex_nr:%d\n",
I16TOF (NTOH16 (b_dat->x)), I16TOF (NTOH16 (b_dat->y)),
b_dat->p_nr, b_dat->pi_nr, b_dat->b_nr, NTOH32 (b_dat->ex_nr));
@@ -1167,8 +1168,9 @@ do_quit (struct pkg_quit *q_dat, _net_ad
d_printf ("do_quit (%s:%s) pl_nr=%d new_server=%d\n", addr->host,
addr->port, q_dat->pl_nr,
q_dat->new_server);
- if (addr->pl_nr == -1)
+ if (addr->pl_nr == -1) {
return;
+ }
if (q_dat->pl_nr == -1)
q_dat->pl_nr = addr->pl_nr;
Index: b/src/player.c
===================================================================
--- a/src/player.c
+++ b/src/player.c
@@ -42,7 +42,7 @@ draw_player (_player * player)
gfx_blit (player->gfx->ani.image, &src, gfx.screen, &dest,
(player->pos.y * 256) + 128);
/* if the player is ill, draw this image above him */
- for (i = PI_max - 1; (i >= 0) && (player->ill[i].to <= 0.0f); i--);
+ for (i = PI_max - 1; (i >= 0) && (player->ill[i].to <= 0.0f); i--) {
if (i >= 0) {
player->illframe += timefactor;
while (player->illframe >= gfx.ill.frames)
@@ -58,6 +58,7 @@ draw_player (_player * player)
gfx.offset.y + ((player->pos.y - 1.0f) * gfx.block.y);
gfx_blit (gfx.ill.image, &src, gfx.screen, &dest,
(player->pos.y*256) + 129);
}
+ }
}
else if (PS_IS_respawn (player->state)) {
@@ -273,12 +274,15 @@ check_field (short int x, short int y)
int check_exfield (short int x, short int y) {
int res = 1, i;
- if (map.field[x][y].type == FT_stone || map.field[x][y].type == FT_block)
+ if (map.field[x][y].type == FT_stone || map.field[x][y].type == FT_block) {
res = 0;
+ }
- for (i = 0; (i < 4 && res == 1); i++)
- if (map.field[x][y].ex[i].count > 0)
+ for (i = 0; (i < 4 && res == 1); i++) {
+ if (map.field[x][y].ex[i].count > 0) {
res = 0;
+ }
+ }
return res;
}
@@ -842,8 +846,9 @@ player_set_ilness (_player * p, int t, f
void
player_clear_ilness (_player * p, int type)
{
- if (type < 0 || type >= PI_max)
+ if (type < 0 || type >= PI_max) {
return;
+ }
d_printf ("player_clear_ilness Player: %s Type: %d\n", p->name, type);
@@ -1033,9 +1038,10 @@ player_delete (int pl_nr) {
net_game_send_delplayer (pl_nr);
}
- if (GT_MP_PTPM && bman.notifygamemaster)
+ if (GT_MP_PTPM && bman.notifygamemaster) {
send_ogc_update ();
-
+ }
+
if (bman.p_nr == pl_nr)
bman.p_nr = -1;
if (bman.p2_nr == pl_nr)
Index: b/src/single.c
===================================================================
--- a/src/single.c
+++ b/src/single.c
@@ -570,9 +570,11 @@ single_playergame (int second_player, in
}
done = 0;
- for (bman.p_nr = -1, p = 0; (bman.p_nr == -1 && p < MAX_PLAYERS); p++)
- if (!(PS_IS_used (players[p].state)))
+ for (bman.p_nr = -1, p = 0; (bman.p_nr == -1 && p < MAX_PLAYERS); p++) {
+ if (!(PS_IS_used (players[p].state))) {
bman.p_nr = p;
+ }
+ }
players[bman.p_nr].team_nr = 0;
if (bman.p_nr >= MAX_PLAYERS) {
