2012-07-05 Hui Zhu <hui_zhu@mentor.com>

	* breakpoint.c (check_for_argument): Move to file cli/cli-utils.c.
	* cli/cli-utils.c (check_for_argument): New function.
	* cli/cli-utils.h (check_for_argument): Ditto.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 087ed25e6f8a02ca7fe84ba9932a9dabae78c41c..ede73f29f5437ed5ce83b87eca7321b142b71940 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2012-07-05  Hui Zhu  <hui_zhu@mentor.com>
+
+       * breakpoint.c (check_for_argument): Move to file cli/cli-utils.c.
+       * cli/cli-utils.c (check_for_argument): New function.
+       * cli/cli-utils.h (check_for_argument): Ditto.
+
 2012-07-04  H.J. Lu  <hongjiu.lu@intel.com>
 
        * NEWS: Mention x32 ABI support.

diff --git a/gdb/breakpoint.c b/gdb/breakpoint.c
index 555694efabdfca61e6483d311da1c6b0340136d0..6b9faf33e0c1d74eb15b1ddcb8fc86daa6b681fa 100644 (file)
--- a/gdb/breakpoint.c
+++ b/gdb/breakpoint.c
@@ -11085,23 +11085,6 @@ watch_command_wrapper (char *arg, int from_tty, int internal)
   watch_command_1 (arg, hw_write, from_tty, 0, internal);
 }
 
-/* A helper function that looks for an argument at the start of a
-   string.  The argument must also either be at the end of the string,
-   or be followed by whitespace.  Returns 1 if it finds the argument,
-   0 otherwise.  If the argument is found, it updates *STR.  */
-
-static int
-check_for_argument (char **str, char *arg, int arg_len)
-{
-  if (strncmp (*str, arg, arg_len) == 0
-      && ((*str)[arg_len] == '\0' || isspace ((*str)[arg_len])))
-    {
-      *str += arg_len;
-      return 1;
-    }
-  return 0;
-}
-
 /* A helper function that looks for the "-location" argument and then
    calls watch_command_1.  */
 

diff --git a/gdb/cli/cli-utils.c b/gdb/cli/cli-utils.c
index 3239a466826e64fe51f6a9e8b34e3d6e317d9061..81a4acc3d803ab30a4b2e890fc494747263b41f4 100644 (file)
--- a/gdb/cli/cli-utils.c
+++ b/gdb/cli/cli-utils.c
@@ -286,3 +286,17 @@ extract_arg (char **arg)
 
   return copy;
 }
+
+/* See documentation in cli-utils.h.  */
+
+int
+check_for_argument (char **str, char *arg, int arg_len)
+{
+  if (strncmp (*str, arg, arg_len) == 0
+      && ((*str)[arg_len] == '\0' || isspace ((*str)[arg_len])))
+    {
+      *str += arg_len;
+      return 1;
+    }
+  return 0;
+}

diff --git a/gdb/cli/cli-utils.h b/gdb/cli/cli-utils.h
index 5f8a91de515b41202b32a74188170a0fa040a817..9fb12ba962e49c6ba89f6bd3fb0f1b011783ae02 100644 (file)
--- a/gdb/cli/cli-utils.h
+++ b/gdb/cli/cli-utils.h
@@ -114,4 +114,10 @@ extern char *remove_trailing_whitespace (const char *start, char *s);
 
 extern char *extract_arg (char **arg);
 
+/* A helper function that looks for an argument at the start of a
+   string.  The argument must also either be at the end of the string,
+   or be followed by whitespace.  Returns 1 if it finds the argument,
+   0 otherwise.  If the argument is found, it updates *STR.  */
+extern int check_for_argument (char **str, char *arg, int arg_len);
+
 #endif /* CLI_UTILS_H */