aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPedro Alves <palves@redhat.com>2013-03-22 20:23:58 +0000
committerPedro Alves <palves@redhat.com>2013-03-22 20:23:58 +0000
commitab19f3254b64b17b7e5fed11cc89b65e8330146e (patch)
tree30e3ba546e919d7f8773d9b2f2c8a8b08a601e2f
parent2ce09ced3c676f1ed39a612fdeed4ecfc4623881 (diff)
downloadfsf-binutils-gdb-ab19f3254b64b17b7e5fed11cc89b65e8330146e.zip
fsf-binutils-gdb-ab19f3254b64b17b7e5fed11cc89b65e8330146e.tar.gz
fsf-binutils-gdb-ab19f3254b64b17b7e5fed11cc89b65e8330146e.tar.bz2
Whoops, wrong patch. Reverting.
-rw-r--r--gdb/ChangeLog9
-rw-r--r--gdb/cli/cli-setshow.c13
2 files changed, 2 insertions, 20 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index a4027c9..26dafe9 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,12 +1,3 @@
-2013-03-22 Pedro Alves <palves@redhat.com>
- Yao Qi <yao@codesourcery.com>
- Mark Kettenis <kettenis@gnu.org>
-
- * cli/cli-setshow.c (do_set_command) <var_uinteger>:
- Don't let the user set the value to UINT_MAX directly.
- <var_integer>: Don't let the user set the value to INT_MAX
- directly.
-
2013-03-22 Jan Kratochvil <jan.kratochvil@redhat.com>
* remote.c (remote_unpush_target): New function.
diff --git a/gdb/cli/cli-setshow.c b/gdb/cli/cli-setshow.c
index 81b90e7..95ebbe7 100644
--- a/gdb/cli/cli-setshow.c
+++ b/gdb/cli/cli-setshow.c
@@ -278,11 +278,7 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
if (c->var_type == var_uinteger && val == 0)
val = UINT_MAX;
- /* For var_uinteger, don't let the user set the value to
- UINT_MAX directly, as that exposes an implementation detail
- to the user interface. */
- else if ((c->var_type == var_uinteger && val >= UINT_MAX)
- || (c->var_type == var_zuinteger && val > UINT_MAX))
+ else if (val > UINT_MAX)
error (_("integer %s out of range"), plongest (val));
if (*(unsigned int *) c->var != val)
@@ -304,12 +300,7 @@ do_set_command (char *arg, int from_tty, struct cmd_list_element *c)
if (val == 0 && c->var_type == var_integer)
val = INT_MAX;
- /* For var_integer, don't let the user set the value to
- INT_MAX directly, as that exposes an implementation detail
- to the user interface. */
- else if ((c->var_type == var_integer && val >= INT_MAX)
- || (c->var_type == var_zinteger && val > INT_MAX)
- || val < INT_MIN)
+ else if (val > INT_MAX || val < INT_MIN)
error (_("integer %s out of range"), plongest (val));
if (*(int *) c->var != val)