mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Silence incorrect warning from gcc 4.9 

This makes the box_move_xy function return a value on all code
paths. This was not really necessary as there is an assert in the path
that could have returned without a value. The gcc optimiser seems
unable to reason about this in this case causing a warning.
This commit is contained in:
Vincent Sanders 2015-05-03 17:23:44 +01:00
parent 7e6b86eb1a
commit a375e58bb8
1 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
render/box.c
View File

@ -481,15 +481,18 @@ enum box_walk_dir {
static inline struct box *box_move_xy(struct box *b, enum box_walk_dir dir,
int *x, int *y)
{
struct box *rb = NULL;
switch (dir) {
case BOX_WALK_CHILDREN:
b = b->children;
if (b == NULL)
return NULL;
break;
*x += b->x;
*y += b->y;
if (!box_is_float(b)) {
return b;
rb = b;
break;
}
/* Fall through */
@ -503,39 +506,46 @@ static inline struct box *box_move_xy(struct box *b, enum box_walk_dir dir,
*x += b->x;
*y += b->y;
} while (box_is_float(b));
return b;
rb = b;
break;
case BOX_WALK_PARENT:
*x -= b->x;
*y -= b->y;
return b->parent;
rb = b->parent;
break;
case BOX_WALK_FLOAT_CHILDREN:
b = b->float_children;
if (b == NULL)
return NULL;
break;
*x += b->x;
*y += b->y;
return b;
rb = b;
break;
case BOX_WALK_NEXT_FLOAT_SIBLING:
*x -= b->x;
*y -= b->y;
b = b->next_float;
if (b == NULL)
return NULL;
break;
*x += b->x;
*y += b->y;
return b;
rb = b;
break;
case BOX_WALK_FLOAT_CONTAINER:
*x -= b->x;
*y -= b->y;
return b->float_container;
rb = b->float_container;
break;
default:
assert(0 && "Bad box walk type.");
}
return rb;
}