* tracepoint.c (trace_actions_command): Update.

	* thread.c (thread_apply_command): Update.
	* reverse.c (delete_bookmark_command): Update.
	(bookmarks_info): Update.
	* printcmd.c (undisplay_command): Update.
	* memattr.c (mem_enable_command): Update.
	(mem_disable_command): Update.
	(mem_delete_command): Update.
	* inferior.c (detach_inferior_command): Update.
	(kill_inferior_command): Update.
	(remove_inferior_command): Update.
	* cli/cli-utils.h (struct get_number_or_range_state): New.
	(init_number_or_range): Declare.
	(get_number_or_range): Update.
	* cli/cli-utils.c (init_number_or_range): New function.
	(get_number_or_range): Change 'pp' parameter to 'state'.  Remove
	static variables.
	(number_is_in_list): Update.
	* breakpoint.h (get_tracepoint_by_number): Update.
	* breakpoint.c (map_breakpoint_numbers): Update for change to
	get_number_or_range.
	(find_location_by_number): Use get_number, not
	get_number_or_range.
	(trace_pass_set_count): New function.
	(trace_pass_command): Update for change to get_number_or_range.
	Rework loop logic.
	(get_tracepoint_by_number): Remove 'multi_p' parameter; add
	'state' parameter.

1 files changed, 25 insertions, 12 deletions

diff --git a/gdb/memattr.c b/gdb/memattr.c
index 1a2be8f102c..d576155c809 100644
--- a/gdb/memattr.c
+++ b/gdb/memattr.c
@@ -28,6 +28,7 @@
 #include "vec.h"
 #include "gdb_string.h"
 #include "breakpoint.h"
+#include "cli/cli-utils.h"
 
 const struct mem_attrib default_mem_attrib =
 {
@@ -577,11 +578,16 @@ mem_enable_command (char *args, int from_tty)
 	m->enabled_p = 1;
     }
   else
-    while (args != NULL && *args != '\0')
-      {
-	num = get_number_or_range (&args);
-	mem_enable (num);
-      }
+    {
+      struct get_number_or_range_state state;
+
+      init_number_or_range (&state, args);
+      while (!state.finished)
+	{
+	  num = get_number_or_range (&state);
+	  mem_enable (num);
+	}
+    }
 }
 
 
@@ -619,11 +625,16 @@ mem_disable_command (char *args, int from_tty)
 	m->enabled_p = 0;
     }
   else
-    while (args != NULL && *args != '\0')
-      {
-	num = get_number_or_range (&args);
-	mem_disable (num);
-      }
+    {
+      struct get_number_or_range_state state;
+
+      init_number_or_range (&state, args);
+      while (!state.finished)
+	{
+	  num = get_number_or_range (&state);
+	  mem_disable (num);
+	}
+    }
 }
 
 /* Delete the memory region number NUM.  */
@@ -657,6 +668,7 @@ static void
 mem_delete_command (char *args, int from_tty)
 {
   int num;
+  struct get_number_or_range_state state;
 
   require_user_regions (from_tty);
 
@@ -670,9 +682,10 @@ mem_delete_command (char *args, int from_tty)
       return;
     }
 
-  while (args != NULL && *args != '\0')
+  init_number_or_range (&state, args);
+  while (!state.finished)
     {
-      num = get_number_or_range (&args);
+      num = get_number_or_range (&state);
       mem_delete (num);
     }