* cli/cli-setshow.c (do_setshow_command): Handle case 'var_uinteger'
	and 'var_zuninteger' together.  Handle case 'var_integer' and
	'var_zinteger' together.
This commit is contained in:
Yao Qi
2012-07-24 12:49:22 +00:00
parent 3c6d336c31
commit e2d12c2152
2 changed files with 10 additions and 12 deletions

View File

@@ -1,3 +1,9 @@
2012-07-24 Yao Qi <yao@codesourcery.com>
* cli/cli-setshow.c: Handle case 'var_uinteger'
and 'var_zuninteger' together. Handle case 'var_integer' and
'var_zinteger' together.
2012-07-23 Keith Seitz <keiths@redhat.com> 2012-07-23 Keith Seitz <keiths@redhat.com>
* linespec.c (convert_linespec_to_sal): Don't add * linespec.c (convert_linespec_to_sal): Don't add

View File

@@ -208,20 +208,22 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
*(enum auto_boolean *) c->var = parse_auto_binary_operation (arg); *(enum auto_boolean *) c->var = parse_auto_binary_operation (arg);
break; break;
case var_uinteger: case var_uinteger:
case var_zuinteger:
if (arg == NULL) if (arg == NULL)
error_no_arg (_("integer to set it to.")); error_no_arg (_("integer to set it to."));
*(unsigned int *) c->var = parse_and_eval_long (arg); *(unsigned int *) c->var = parse_and_eval_long (arg);
if (*(unsigned int *) c->var == 0) if (c->var_type == var_uinteger && *(unsigned int *) c->var == 0)
*(unsigned int *) c->var = UINT_MAX; *(unsigned int *) c->var = UINT_MAX;
break; break;
case var_integer: case var_integer:
case var_zinteger:
{ {
unsigned int val; unsigned int val;
if (arg == NULL) if (arg == NULL)
error_no_arg (_("integer to set it to.")); error_no_arg (_("integer to set it to."));
val = parse_and_eval_long (arg); val = parse_and_eval_long (arg);
if (val == 0) if (val == 0 && c->var_type == var_integer)
*(int *) c->var = INT_MAX; *(int *) c->var = INT_MAX;
else if (val >= INT_MAX) else if (val >= INT_MAX)
error (_("integer %u out of range"), val); error (_("integer %u out of range"), val);
@@ -229,16 +231,6 @@ do_setshow_command (char *arg, int from_tty, struct cmd_list_element *c)
*(int *) c->var = val; *(int *) c->var = val;
break; break;
} }
case var_zinteger:
if (arg == NULL)
error_no_arg (_("integer to set it to."));
*(int *) c->var = parse_and_eval_long (arg);
break;
case var_zuinteger:
if (arg == NULL)
error_no_arg (_("integer to set it to."));
*(unsigned int *) c->var = parse_and_eval_long (arg);
break;
case var_enum: case var_enum:
{ {
int i; int i;