Re: [PATCH] Display var_zinteger as signed

Andrew Burgess
2011-07-05T08:00:52Z

On 04/07/2011 19:09, Joel Brobecker wrote:
>> 2011-07-04 Andrew Burgess<aburgess@broadcom.com>
>>
>> * cli/cli-setshow.c (do_setshow_command): Display var_zinteger
>> variables as signed, not unsigned.
>
> I'm not a fan of fall throughs, like this, because I think it
> makes the code harder to read, but if no other maintainer has
> an objection to it, then the patch is OK (please wait for a couple
> of days to give everyone else a little time to comment on this).
>
> I'd personally write this:
>
> case var_integer:
> case var_zinteger:
> if (c->var_type == var_integer&& *(int *) c->var == INT_MAX)
> fputs_filtered ("unlimited", stb->stream);
> else
> fprintf_filtered (stb->stream, "%d", *(int *) c->var);
>

The revised patch below removes the fall through from both the signed and unsigned cases (I just couldn't have different code for the two cases).

Thanks,
Andrew

2011-07-04 Andrew Burgess <aburgess@broadcom.com>

* cli/cli-setshow.c (do_setshow_command): Display var_zinteger
variables as signed, not unsigned.

diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 6acdd91..ef04aac 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -358,21 +358,18 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
}
break;
case var_uinteger:
- if (*(unsigned int *) c->var == UINT_MAX)
- {
- fputs_filtered ("unlimited", stb->stream);
- break;
- }
- /* else fall through */
case var_zuinteger:
- case var_zinteger:
- fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
+ if (c->var_type == var_uinteger &&
+ *(unsigned int *) c->var == UINT_MAX)
+ fputs_filtered ("unlimited", stb->stream);
+ else
+ fprintf_filtered (stb->stream, "%u", *(unsigned int *) c->var);
break;
case var_integer:
- if (*(int *) c->var == INT_MAX)
- {
- fputs_filtered ("unlimited", stb->stream);
- }
+ case var_zinteger:
+ if (c->var_type == var_integer &&
+ *(int *) c->var == INT_MAX)
+ fputs_filtered ("unlimited", stb->stream);
else
fprintf_filtered (stb->stream, "%d", *(int *) c->var);
break;