From 5e1471f57fac8ea99e40cfb4be212e896bac56ff Mon Sep 17 00:00:00 2001 From: Doug Evans Date: Fri, 9 May 2008 17:37:36 +0000 Subject: [PATCH] * error.c (parse_find_args): Fix capitalization in previous patch. (find_command): Ditto. * target.c (simple_search_memory): Ditto. * gdbserver/server.c (handle_search_memory_1): Ditto. (handle_search_memory): Ditto. --- gdb/findcmd.c | 22 +++++++++++----------- gdb/gdbserver/server.c | 10 +++++----- gdb/target.c | 6 +++--- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/gdb/findcmd.c b/gdb/findcmd.c index dfb746b70df..a1dfaf3bb2c 100644 --- a/gdb/findcmd.c +++ b/gdb/findcmd.c @@ -72,7 +72,7 @@ parse_find_args (char *args, ULONGEST *max_countp, struct value *v; if (args == NULL) - error (_("missing search parameters")); + error (_("Missing search parameters.")); pattern_buf = xmalloc (pattern_buf_size); pattern_buf_end = pattern_buf; @@ -104,7 +104,7 @@ parse_find_args (char *args, ULONGEST *max_countp, size = *s++; break; default: - error (_("invalid size granularity")); + error (_("Invalid size granularity.")); } } @@ -130,15 +130,15 @@ parse_find_args (char *args, ULONGEST *max_countp, len = value_as_long (v); if (len == 0) { - printf_filtered (_("empty search range\n")); + printf_filtered (_("Empty search range.\n")); return; } if (len < 0) - error (_("invalid length")); + error (_("Invalid length.")); /* Watch for overflows. */ if (len > CORE_ADDR_MAX || (start_addr + len - 1) < start_addr) - error (_("search space too large")); + error (_("Search space too large.")); search_space_len = len; } else @@ -147,13 +147,13 @@ parse_find_args (char *args, ULONGEST *max_countp, v = parse_to_comma_and_eval (&s); end_addr = value_as_address (v); if (start_addr > end_addr) - error (_("invalid search space, end preceeds start")); + error (_("Invalid search space, end preceeds start.")); search_space_len = end_addr - start_addr + 1; /* We don't support searching all of memory (i.e. start=0, end = 0xff..ff). Bail to avoid overflows later on. */ if (search_space_len == 0) - error (_("overflow in address range computation, choose smaller range")); + error (_("Overflow in address range computation, choose smaller range.")); } if (*s == ',') @@ -218,12 +218,12 @@ parse_find_args (char *args, ULONGEST *max_countp, } if (pattern_buf_end == pattern_buf) - error (_("missing search pattern")); + error (_("Missing search pattern.")); pattern_len = pattern_buf_end - pattern_buf; if (search_space_len < pattern_len) - error (_("search space too small to contain pattern")); + error (_("Search space too small to contain pattern.")); *max_countp = max_count; *pattern_bufp = pattern_buf; @@ -302,9 +302,9 @@ find_command (char *args, int from_tty) } if (found_count == 0) - printf_filtered ("pattern not found\n"); + printf_filtered ("Pattern not found.\n"); else - printf_filtered ("%d pattern%s found\n", found_count, + printf_filtered ("%d pattern%s found.\n", found_count, found_count > 1 ? "s" : ""); do_cleanups (old_cleanups); diff --git a/gdb/gdbserver/server.c b/gdb/gdbserver/server.c index 6993ae35e42..ab4d8ecebfa 100644 --- a/gdb/gdbserver/server.c +++ b/gdb/gdbserver/server.c @@ -327,7 +327,7 @@ handle_search_memory_1 (CORE_ADDR start_addr, CORE_ADDR search_space_len, if (read_inferior_memory (start_addr, search_buf, search_buf_size) != 0) { - warning ("unable to access target memory at 0x%lx, halting search", + warning ("Unable to access target memory at 0x%lx, halting search.", (long) start_addr); return -1; } @@ -379,7 +379,7 @@ handle_search_memory_1 (CORE_ADDR start_addr, CORE_ADDR search_space_len, if (read_inferior_memory (read_addr, search_buf + keep_len, nr_to_read) != 0) { - warning ("unable to access target memory at 0x%lx, halting search", + warning ("Unable to access target memory at 0x%lx, halting search.", (long) read_addr); return -1; } @@ -415,7 +415,7 @@ handle_search_memory (char *own_buf, int packet_len) pattern = malloc (packet_len); if (pattern == NULL) { - error ("unable to allocate memory to perform the search"); + error ("Unable to allocate memory to perform the search"); strcpy (own_buf, "E00"); return; } @@ -425,7 +425,7 @@ handle_search_memory (char *own_buf, int packet_len) pattern, &pattern_len) < 0) { free (pattern); - error ("error in parsing qSearch:memory packet"); + error ("Error in parsing qSearch:memory packet"); strcpy (own_buf, "E00"); return; } @@ -440,7 +440,7 @@ handle_search_memory (char *own_buf, int packet_len) if (search_buf == NULL) { free (pattern); - error ("unable to allocate memory to perform the search"); + error ("Unable to allocate memory to perform the search"); strcpy (own_buf, "E00"); return; } diff --git a/gdb/target.c b/gdb/target.c index a9f92543e5b..be7f3a11e22 100644 --- a/gdb/target.c +++ b/gdb/target.c @@ -1788,7 +1788,7 @@ simple_search_memory (struct target_ops *ops, search_buf = malloc (search_buf_size); if (search_buf == NULL) - error (_("unable to allocate memory to perform the search")); + error (_("Unable to allocate memory to perform the search.")); old_cleanups = make_cleanup (free_current_contents, &search_buf); /* Prime the search buffer. */ @@ -1796,7 +1796,7 @@ simple_search_memory (struct target_ops *ops, if (target_read (ops, TARGET_OBJECT_MEMORY, NULL, search_buf, start_addr, search_buf_size) != search_buf_size) { - warning (_("unable to access target memory at %s, halting search"), + warning (_("Unable to access target memory at %s, halting search."), hex_string (start_addr)); do_cleanups (old_cleanups); return -1; @@ -1849,7 +1849,7 @@ simple_search_memory (struct target_ops *ops, search_buf + keep_len, read_addr, nr_to_read) != nr_to_read) { - warning (_("unable to access target memory at %s, halting search"), + warning (_("Unable to access target memory at %s, halting search."), hex_string (read_addr)); do_cleanups (old_cleanups); return -1; -- 2.30.2