FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

New common function "startswith"

Browse source 
This commit introduces a new inline common function "startswith"
which takes two string arguments and returns nonzero if the first
string starts with the second.  It also updates the 295 places
where this logic was written out longhand to use the new function.

gdb/ChangeLog:

	* common/common-utils.h (startswith): New inline function.
	All places where this logic was used updated to use the above.
This commit is contained in:
Gary Benson 2015-03-06 09:42:06 +00:00
parent e80417caef
commit 61012eef84
77 changed files with 309 additions and 329 deletions
Download patch file Download diff file Expand all files Collapse all files

5
gdb/ChangeLog
View file

@ -1,3 +1,8 @@
2015-03-06 Gary Benson <gbenson@redhat.com>
* common/common-utils.h (startswith): New inline function.
All places where this logic was used updated to use the above.
2015-03-05 Pedro Alves <palves@redhat.com> 2015-03-05 Pedro Alves <palves@redhat.com>
PR gdb/18002 PR gdb/18002

55
gdb/ada-lang.c
View file

@ -596,7 +596,7 @@ field_name_match (const char *field_name, const char *target)
return return
(strncmp (field_name, target, len) == 0 (strncmp (field_name, target, len) == 0
&& (field_name[len] == '\0' && (field_name[len] == '\0'
|| (strncmp (field_name + len, "___", 3) == 0 || (startswith (field_name + len, "___")
&& strcmp (field_name + strlen (field_name) - 6, && strcmp (field_name + strlen (field_name) - 6,
"___XVN") != 0))); "___XVN") != 0)));
} }
@ -1003,8 +1003,7 @@ ada_encode (const char *decoded)
for (mapping = ada_opname_table; for (mapping = ada_opname_table;
mapping->encoded != NULL mapping->encoded != NULL
&& strncmp (mapping->decoded, p, && !startswith (p, mapping->decoded); mapping += 1)
strlen (mapping->decoded)) != 0; mapping += 1)
; ;
if (mapping->encoded == NULL) if (mapping->encoded == NULL)
error (_("invalid Ada operator name: %s"), p); error (_("invalid Ada operator name: %s"), p);
@ -1085,9 +1084,9 @@ ada_remove_trailing_digits (const char *encoded, int *len)
*len = i; *len = i;
else if (i >= 0 && encoded[i] == '$') else if (i >= 0 && encoded[i] == '$')
*len = i; *len = i;
else if (i >= 2 && strncmp (encoded + i - 2, "___", 3) == 0) else if (i >= 2 && startswith (encoded + i - 2, "___"))
*len = i - 2; *len = i - 2;
else if (i >= 1 && strncmp (encoded + i - 1, "__", 2) == 0) else if (i >= 1 && startswith (encoded + i - 1, "__"))
*len = i - 1; *len = i - 1;
} }
} }
@ -1156,7 +1155,7 @@ ada_decode (const char *encoded)
/* The name of the Ada main procedure starts with "_ada_". /* The name of the Ada main procedure starts with "_ada_".
This prefix is not part of the decoded name, so skip this part This prefix is not part of the decoded name, so skip this part
if we see this prefix. */ if we see this prefix. */
if (strncmp (encoded, "_ada_", 5) == 0) if (startswith (encoded, "_ada_"))
encoded += 5; encoded += 5;
/* If the name starts with '_', then it is not a properly encoded /* If the name starts with '_', then it is not a properly encoded
@ -1187,20 +1186,20 @@ ada_decode (const char *encoded)
is for the body of a task, but that information does not actually is for the body of a task, but that information does not actually
appear in the decoded name. */ appear in the decoded name. */
if (len0 > 3 && strncmp (encoded + len0 - 3, "TKB", 3) == 0) if (len0 > 3 && startswith (encoded + len0 - 3, "TKB"))
len0 -= 3; len0 -= 3;
/* Remove any trailing TB suffix. The TB suffix is slightly different /* Remove any trailing TB suffix. The TB suffix is slightly different
from the TKB suffix because it is used for non-anonymous task from the TKB suffix because it is used for non-anonymous task
bodies. */ bodies. */
if (len0 > 2 && strncmp (encoded + len0 - 2, "TB", 2) == 0) if (len0 > 2 && startswith (encoded + len0 - 2, "TB"))
len0 -= 2; len0 -= 2;
/* Remove trailing "B" suffixes. */ /* Remove trailing "B" suffixes. */
/* FIXME: brobecker/2006-04-19: Not sure what this are used for... */ /* FIXME: brobecker/2006-04-19: Not sure what this are used for... */
if (len0 > 1 && strncmp (encoded + len0 - 1, "B", 1) == 0) if (len0 > 1 && startswith (encoded + len0 - 1, "B"))
len0 -= 1; len0 -= 1;
/* Make decoded big enough for possible expansion by operator name. */ /* Make decoded big enough for possible expansion by operator name. */
@ -1258,7 +1257,7 @@ ada_decode (const char *encoded)
/* Replace "TK__" with "__", which will eventually be translated /* Replace "TK__" with "__", which will eventually be translated
into "." (just below). */ into "." (just below). */
if (i < len0 - 4 && strncmp (encoded + i, "TK__", 4) == 0) if (i < len0 - 4 && startswith (encoded + i, "TK__"))
i += 2; i += 2;
/* Replace "__B_{DIGITS}+__" sequences by "__", which will eventually /* Replace "__B_{DIGITS}+__" sequences by "__", which will eventually
@ -1467,7 +1466,7 @@ match_name (const char *sym_name, const char *name, int wild)
return (strncmp (sym_name, name, len_name) == 0 return (strncmp (sym_name, name, len_name) == 0
&& is_name_suffix (sym_name + len_name)) && is_name_suffix (sym_name + len_name))
|| (strncmp (sym_name, "_ada_", 5) == 0 || (startswith (sym_name, "_ada_")
&& strncmp (sym_name + 5, name, len_name) == 0 && strncmp (sym_name + 5, name, len_name) == 0
&& is_name_suffix (sym_name + len_name + 5)); && is_name_suffix (sym_name + len_name + 5));
} }
@ -4604,7 +4603,7 @@ lesseq_defined_than (struct symbol *sym0, struct symbol *sym1)
TYPE_CODE (type0) == TYPE_CODE (type1) TYPE_CODE (type0) == TYPE_CODE (type1)
&& (equiv_types (type0, type1) && (equiv_types (type0, type1)
|| (len0 < strlen (name1) && strncmp (name0, name1, len0) == 0 || (len0 < strlen (name1) && strncmp (name0, name1, len0) == 0
&& strncmp (name1 + len0, "___XV", 5) == 0)); && startswith (name1 + len0, "___XV")));
} }
case LOC_CONST: case LOC_CONST:
return SYMBOL_VALUE (sym0) == SYMBOL_VALUE (sym1) return SYMBOL_VALUE (sym0) == SYMBOL_VALUE (sym1)
@ -4700,7 +4699,7 @@ ada_lookup_simple_minsym (const char *name)
using, for instance, Standard.Constraint_Error when Constraint_Error using, for instance, Standard.Constraint_Error when Constraint_Error
is ambiguous (due to the user defining its own Constraint_Error is ambiguous (due to the user defining its own Constraint_Error
entity inside its program). */ entity inside its program). */
if (strncmp (name, "standard__", sizeof ("standard__") - 1) == 0) if (startswith (name, "standard__"))
name += sizeof ("standard__") - 1; name += sizeof ("standard__") - 1;
ALL_MSYMBOLS (objfile, msymbol) ALL_MSYMBOLS (objfile, msymbol)
@ -5028,11 +5027,11 @@ old_renaming_is_invisible (const struct symbol *sym, const char *function_name)
a library-level function. Strip this prefix before doing the a library-level function. Strip this prefix before doing the
comparison, as the encoding for the renaming does not contain comparison, as the encoding for the renaming does not contain
this prefix. */ this prefix. */
if (strncmp (function_name, "_ada_", 5) == 0) if (startswith (function_name, "_ada_"))
function_name += 5; function_name += 5;
{ {
int is_invisible = strncmp (function_name, scope, strlen (scope)) != 0; int is_invisible = !startswith (function_name, scope);
do_cleanups (old_chain); do_cleanups (old_chain);
return is_invisible; return is_invisible;
@ -5430,7 +5429,7 @@ ada_lookup_symbol_list_worker (const char *name0, const struct block *block0,
using, for instance, Standard.Constraint_Error when Constraint_Error using, for instance, Standard.Constraint_Error when Constraint_Error
is ambiguous (due to the user defining its own Constraint_Error is ambiguous (due to the user defining its own Constraint_Error
entity inside its program). */ entity inside its program). */
if (strncmp (name0, "standard__", sizeof ("standard__") - 1) == 0) if (startswith (name0, "standard__"))
{ {
block = NULL; block = NULL;
name = name0 + sizeof ("standard__") - 1; name = name0 + sizeof ("standard__") - 1;
@ -5830,7 +5829,7 @@ advance_wild_match (const char **namep, const char *name0, int target0)
if ((t1 >= 'a' && t1 <= 'z') || (t1 >= '0' && t1 <= '9')) if ((t1 >= 'a' && t1 <= 'z') || (t1 >= '0' && t1 <= '9'))
{ {
name += 1; name += 1;
if (name == name0 + 5 && strncmp (name0, "_ada", 4) == 0) if (name == name0 + 5 && startswith (name0, "_ada"))
break; break;
else else
name += 1; name += 1;
@ -5984,7 +5983,7 @@ ada_add_block_symbols (struct obstack *obstackp,
cmp = (int) '_' - (int) SYMBOL_LINKAGE_NAME (sym)[0]; cmp = (int) '_' - (int) SYMBOL_LINKAGE_NAME (sym)[0];
if (cmp == 0) if (cmp == 0)
{ {
cmp = strncmp ("_ada_", SYMBOL_LINKAGE_NAME (sym), 5); cmp = !startswith (SYMBOL_LINKAGE_NAME (sym), "_ada_");
if (cmp == 0) if (cmp == 0)
cmp = strncmp (name, SYMBOL_LINKAGE_NAME (sym) + 5, cmp = strncmp (name, SYMBOL_LINKAGE_NAME (sym) + 5,
name_len); name_len);
@ -6371,7 +6370,7 @@ ada_is_ignored_field (struct type *type, int field_num)
for tagged types, and it contains the components inherited from for tagged types, and it contains the components inherited from
the parent type. This field should not be printed as is, but the parent type. This field should not be printed as is, but
should not be ignored either. */ should not be ignored either. */
if (name[0] == '_' && strncmp (name, "_parent", 7) != 0) if (name[0] == '_' && !startswith (name, "_parent"))
return 1; return 1;
} }
@ -6698,8 +6697,8 @@ ada_is_parent_field (struct type *type, int field_num)
const char *name = TYPE_FIELD_NAME (ada_check_typedef (type), field_num); const char *name = TYPE_FIELD_NAME (ada_check_typedef (type), field_num);
return (name != NULL return (name != NULL
&& (strncmp (name, "PARENT", 6) == 0 && (startswith (name, "PARENT")
|| strncmp (name, "_parent", 7) == 0)); || startswith (name, "_parent")));
} }
/* True iff field number FIELD_NUM of structure type TYPE is a /* True iff field number FIELD_NUM of structure type TYPE is a
@ -6714,9 +6713,9 @@ ada_is_wrapper_field (struct type *type, int field_num)
const char *name = TYPE_FIELD_NAME (type, field_num); const char *name = TYPE_FIELD_NAME (type, field_num);
return (name != NULL return (name != NULL
&& (strncmp (name, "PARENT", 6) == 0 && (startswith (name, "PARENT")
|| strcmp (name, "REP") == 0 || strcmp (name, "REP") == 0
|| strncmp (name, "_parent", 7) == 0 || startswith (name, "_parent")
|| name[0] == 'S' || name[0] == 'R' || name[0] == 'O')); || name[0] == 'S' || name[0] == 'R' || name[0] == 'O'));
} }
@ -6787,7 +6786,7 @@ ada_variant_discrim_name (struct type *type0)
for (discrim_end = name + strlen (name) - 6; discrim_end != name; for (discrim_end = name + strlen (name) - 6; discrim_end != name;
discrim_end -= 1) discrim_end -= 1)
{ {
if (strncmp (discrim_end, "___XVN", 6) == 0) if (startswith (discrim_end, "___XVN"))
break; break;
} }
if (discrim_end == name) if (discrim_end == name)
@ -6799,7 +6798,7 @@ ada_variant_discrim_name (struct type *type0)
if (discrim_start == name + 1) if (discrim_start == name + 1)
return ""; return "";
if ((discrim_start > name + 3 if ((discrim_start > name + 3
&& strncmp (discrim_start - 3, "___", 3) == 0) && startswith (discrim_start - 3, "___"))
|| discrim_start[-1] == '.') || discrim_start[-1] == '.')
break; break;
} }
@ -7551,7 +7550,7 @@ field_alignment (struct type *type, int f)
else else
align_offset = len - 1; align_offset = len - 1;
if (align_offset < 7 || strncmp ("___XV", name + align_offset - 6, 5) != 0) if (align_offset < 7 || !startswith (name + align_offset - 6, "___XV"))
return TARGET_CHAR_BIT; return TARGET_CHAR_BIT;
return atoi (name + align_offset) * TARGET_CHAR_BIT; return atoi (name + align_offset) * TARGET_CHAR_BIT;
@ -12475,7 +12474,7 @@ catch_ada_exception_command_split (char *args,
/* Check to see if we have a condition. */ /* Check to see if we have a condition. */
args = skip_spaces (args); args = skip_spaces (args);
if (strncmp (args, "if", 2) == 0 if (startswith (args, "if")
&& (isspace (args[2]) || args[2] == '\0')) && (isspace (args[2]) || args[2] == '\0'))
{ {
args += 2; args += 2;
@ -12736,7 +12735,7 @@ catch_ada_assert_command_split (char *args, char **cond_string)
args = skip_spaces (args); args = skip_spaces (args);
/* Check whether a condition was provided. */ /* Check whether a condition was provided. */
if (strncmp (args, "if", 2) == 0 if (startswith (args, "if")
&& (isspace (args[2]) || args[2] == '\0')) && (isspace (args[2]) || args[2] == '\0'))
{ {
args += 2; args += 2;

3
gdb/amd64-tdep.c
View file

@ -2378,8 +2378,7 @@ amd64_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
if (post_prologue_pc if (post_prologue_pc
&& (cust != NULL && (cust != NULL
&& COMPUNIT_PRODUCER (cust) != NULL && COMPUNIT_PRODUCER (cust) != NULL
&& strncmp (COMPUNIT_PRODUCER (cust), "clang ", && startswith (COMPUNIT_PRODUCER (cust), "clang ")))
sizeof ("clang ") - 1) == 0))
return max (start_pc, post_prologue_pc); return max (start_pc, post_prologue_pc);
} }

4
gdb/amd64-windows-tdep.c
View file

@ -1157,8 +1157,8 @@ amd64_windows_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
if (symname) if (symname)
{ {
if (strncmp (symname, "__imp_", 6) == 0 if (startswith (symname, "__imp_")
|| strncmp (symname, "_imp_", 5) == 0) || startswith (symname, "_imp_"))
destination destination
= read_memory_unsigned_integer (indirect_addr, 8, byte_order); = read_memory_unsigned_integer (indirect_addr, 8, byte_order);
} }

4
gdb/amd64obsd-tdep.c
View file

@ -372,7 +372,7 @@ amd64obsd_trapframe_cache (struct frame_info *this_frame, void **this_cache)
sp = get_frame_register_unsigned (this_frame, AMD64_RSP_REGNUM); sp = get_frame_register_unsigned (this_frame, AMD64_RSP_REGNUM);
find_pc_partial_function (func, &name, NULL, NULL); find_pc_partial_function (func, &name, NULL, NULL);
if (name && strncmp (name, "Xintr", 5) == 0) if (name && startswith (name, "Xintr"))
addr = sp + 8; /* It's an interrupt frame. */ addr = sp + 8; /* It's an interrupt frame. */
else else
addr = sp; addr = sp;
@ -436,7 +436,7 @@ amd64obsd_trapframe_sniffer (const struct frame_unwind *self,
return (name && ((strcmp (name, "calltrap") == 0) return (name && ((strcmp (name, "calltrap") == 0)
|| (strcmp (name, "osyscall1") == 0) || (strcmp (name, "osyscall1") == 0)
|| (strcmp (name, "Xsyscall") == 0) || (strcmp (name, "Xsyscall") == 0)
|| (strncmp (name, "Xintr", 5) == 0))); || (startswith (name, "Xintr"))));
} }
static const struct frame_unwind amd64obsd_trapframe_unwind = { static const struct frame_unwind amd64obsd_trapframe_unwind = {

2
gdb/arch-utils.c
View file

@ -661,7 +661,7 @@ initialize_current_architecture (void)
chp = strchr (target_name, '-'); chp = strchr (target_name, '-');
if (chp != NULL if (chp != NULL
&& chp - 2 >= target_name && chp - 2 >= target_name
&& strncmp (chp - 2, "el", 2) == 0) && startswith (chp - 2, "el"))
default_byte_order = BFD_ENDIAN_LITTLE; default_byte_order = BFD_ENDIAN_LITTLE;
} }
if (default_byte_order == BFD_ENDIAN_UNKNOWN) if (default_byte_order == BFD_ENDIAN_UNKNOWN)

28
gdb/arm-tdep.c
View file

@ -484,15 +484,15 @@ skip_prologue_function (struct gdbarch *gdbarch, CORE_ADDR pc, int is_thumb)
/* On soft-float targets, __truncdfsf2 is called to convert promoted /* On soft-float targets, __truncdfsf2 is called to convert promoted
arguments to their argument types in non-prototyped arguments to their argument types in non-prototyped
functions. */ functions. */
if (strncmp (name, "__truncdfsf2", strlen ("__truncdfsf2")) == 0) if (startswith (name, "__truncdfsf2"))
return 1; return 1;
if (strncmp (name, "__aeabi_d2f", strlen ("__aeabi_d2f")) == 0) if (startswith (name, "__aeabi_d2f"))
return 1; return 1;
/* Internal functions related to thread-local storage. */ /* Internal functions related to thread-local storage. */
if (strncmp (name, "__tls_get_addr", strlen ("__tls_get_addr")) == 0) if (startswith (name, "__tls_get_addr"))
return 1; return 1;
if (strncmp (name, "__aeabi_read_tp", strlen ("__aeabi_read_tp")) == 0) if (startswith (name, "__aeabi_read_tp"))
return 1; return 1;
} }
else else
@ -1314,9 +1314,7 @@ arm_skip_stack_protector(CORE_ADDR pc, struct gdbarch *gdbarch)
/* ADDR must correspond to a symbol whose name is __stack_chk_guard. /* ADDR must correspond to a symbol whose name is __stack_chk_guard.
Otherwise, this sequence cannot be for stack protector. */ Otherwise, this sequence cannot be for stack protector. */
if (stack_chk_guard.minsym == NULL if (stack_chk_guard.minsym == NULL
|| strncmp (MSYMBOL_LINKAGE_NAME (stack_chk_guard.minsym), || !startswith (MSYMBOL_LINKAGE_NAME (stack_chk_guard.minsym), "__stack_chk_guard"))
"__stack_chk_guard",
strlen ("__stack_chk_guard")) != 0)
return pc; return pc;
if (is_thumb) if (is_thumb)
@ -1413,10 +1411,8 @@ arm_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR pc)
if (post_prologue_pc if (post_prologue_pc
&& (cust == NULL && (cust == NULL
|| COMPUNIT_PRODUCER (cust) == NULL || COMPUNIT_PRODUCER (cust) == NULL
|| strncmp (COMPUNIT_PRODUCER (cust), "GNU ", || startswith (COMPUNIT_PRODUCER (cust), "GNU ")
sizeof ("GNU ") - 1) == 0 || startswith (COMPUNIT_PRODUCER (cust), "clang ")))
|| strncmp (COMPUNIT_PRODUCER (cust), "clang ",
sizeof ("clang ") - 1) == 0))
return post_prologue_pc; return post_prologue_pc;
if (post_prologue_pc != 0) if (post_prologue_pc != 0)
@ -9315,8 +9311,8 @@ arm_skip_stub (struct frame_info *frame, CORE_ADDR pc)
_call_via_xx, where x is the register name. The possible names _call_via_xx, where x is the register name. The possible names
are r0-r9, sl, fp, ip, sp, and lr. ARM RealView has similar are r0-r9, sl, fp, ip, sp, and lr. ARM RealView has similar
functions, named __ARM_call_via_r[0-7]. */ functions, named __ARM_call_via_r[0-7]. */
if (strncmp (name, "_call_via_", 10) == 0 if (startswith (name, "_call_via_")
|| strncmp (name, "__ARM_call_via_", strlen ("__ARM_call_via_")) == 0) || startswith (name, "__ARM_call_via_"))
{ {
/* Use the name suffix to determine which register contains the /* Use the name suffix to determine which register contains the
target PC. */ target PC. */
@ -9338,11 +9334,9 @@ arm_skip_stub (struct frame_info *frame, CORE_ADDR pc)
namelen = strlen (name); namelen = strlen (name);
if (name[0] == '_' && name[1] == '_' if (name[0] == '_' && name[1] == '_'
&& ((namelen > 2 + strlen ("_from_thumb") && ((namelen > 2 + strlen ("_from_thumb")
&& strncmp (name + namelen - strlen ("_from_thumb"), "_from_thumb", && startswith (name + namelen - strlen ("_from_thumb"), "_from_thumb"))
strlen ("_from_thumb")) == 0)
|| (namelen > 2 + strlen ("_from_arm") || (namelen > 2 + strlen ("_from_arm")
&& strncmp (name + namelen - strlen ("_from_arm"), "_from_arm", && startswith (name + namelen - strlen ("_from_arm"), "_from_arm"))))
strlen ("_from_arm")) == 0)))
{ {
char *target_name; char *target_name;
int target_len = namelen - 2; int target_len = namelen - 2;

2
gdb/arm-wince-tdep.c
View file

@ -66,7 +66,7 @@ arm_pe_skip_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
return 0; return 0;
symname = MSYMBOL_LINKAGE_NAME (indsym.minsym); symname = MSYMBOL_LINKAGE_NAME (indsym.minsym);
if (symname == NULL || strncmp (symname, "__imp_", 6) != 0) if (symname == NULL || !startswith (symname, "__imp_"))
return 0; return 0;
next_pc = read_memory_unsigned_integer (indirect, 4, byte_order); next_pc = read_memory_unsigned_integer (indirect, 4, byte_order);

8
gdb/breakpoint.c
View file

@ -9729,7 +9729,7 @@ parse_breakpoint_sals (char **address,
/* If no arg given, or if first arg is 'if ', use the default /* If no arg given, or if first arg is 'if ', use the default
breakpoint. */ breakpoint. */
if ((*address) == NULL if ((*address) == NULL
|| (strncmp ((*address), "if", 2) == 0 && isspace ((*address)[2]))) || (startswith ((*address), "if") && isspace ((*address)[2])))
{ {
/* The last displayed codepoint, if it's valid, is our default breakpoint /* The last displayed codepoint, if it's valid, is our default breakpoint
address. */ address. */
@ -11401,7 +11401,7 @@ watch_command_1 (const char *arg, int accessflag, int from_tty,
tok++; tok++;
toklen = end_tok - tok + 1; toklen = end_tok - tok + 1;
if (toklen == 6 && !strncmp (tok, "thread", 6)) if (toklen == 6 && startswith (tok, "thread"))
{ {
/* At this point we've found a "thread" token, which means /* At this point we've found a "thread" token, which means
the user is trying to set a watchpoint that triggers the user is trying to set a watchpoint that triggers
@ -11423,7 +11423,7 @@ watch_command_1 (const char *arg, int accessflag, int from_tty,
if (!valid_thread_id (thread)) if (!valid_thread_id (thread))
invalid_thread_id_error (thread); invalid_thread_id_error (thread);
} }
else if (toklen == 4 && !strncmp (tok, "mask", 4)) else if (toklen == 4 && startswith (tok, "mask"))
{ {
/* We've found a "mask" token, which means the user wants to /* We've found a "mask" token, which means the user wants to
create a hardware watchpoint that is going to have the mask create a hardware watchpoint that is going to have the mask
@ -15493,7 +15493,7 @@ strace_command (char *arg, int from_tty)
/* Decide if we are dealing with a static tracepoint marker (`-m'), /* Decide if we are dealing with a static tracepoint marker (`-m'),
or with a normal static tracepoint. */ or with a normal static tracepoint. */
if (arg && strncmp (arg, "-m", 2) == 0 && isspace (arg[2])) if (arg && startswith (arg, "-m") && isspace (arg[2]))
ops = &strace_marker_breakpoint_ops; ops = &strace_marker_breakpoint_ops;
else else
ops = &tracepoint_breakpoint_ops; ops = &tracepoint_breakpoint_ops;

2
gdb/bsd-uthread.c
View file

@ -247,7 +247,7 @@ bsd_uthread_solib_loaded (struct so_list *so)
for (names = bsd_uthread_solib_names; *names; names++) for (names = bsd_uthread_solib_names; *names; names++)
{ {
if (strncmp (so->so_original_name, *names, strlen (*names)) == 0) if (startswith (so->so_original_name, *names))
{ {
solib_read_symbols (so, 0); solib_read_symbols (so, 0);

10
gdb/c-typeprint.c
View file

@ -544,7 +544,7 @@ is_type_conversion_operator (struct type *type, int i, int j)
some other way, feel free to rewrite this function. */ some other way, feel free to rewrite this function. */
const char *name = TYPE_FN_FIELDLIST_NAME (type, i); const char *name = TYPE_FN_FIELDLIST_NAME (type, i);
if (strncmp (name, "operator", 8) != 0) if (!startswith (name, "operator"))
return 0; return 0;
name += 8; name += 8;
@ -560,9 +560,9 @@ is_type_conversion_operator (struct type *type, int i, int j)
/* If this doesn't look like the start of an identifier, then it /* If this doesn't look like the start of an identifier, then it
isn't a type conversion operator. */ isn't a type conversion operator. */
return 0; return 0;
else if (strncmp (name, "new", 3) == 0) else if (startswith (name, "new"))
name += 3; name += 3;
else if (strncmp (name, "delete", 6) == 0) else if (startswith (name, "delete"))
name += 6; name += 6;
else else
/* If it doesn't look like new or delete, it's a type conversion /* If it doesn't look like new or delete, it's a type conversion
@ -933,7 +933,7 @@ c_type_print_base (struct type *type, struct ui_file *stream,
enum}" tag for unnamed struct/union/enum's, which we don't enum}" tag for unnamed struct/union/enum's, which we don't
want to print. */ want to print. */
if (TYPE_TAG_NAME (type) != NULL if (TYPE_TAG_NAME (type) != NULL
&& strncmp (TYPE_TAG_NAME (type), "{unnamed", 8)) && !startswith (TYPE_TAG_NAME (type), "{unnamed"))
{ {
/* When printing the tag name, we are still effectively /* When printing the tag name, we are still effectively
printing in the outer context, hence the use of FLAGS printing in the outer context, hence the use of FLAGS
@ -1345,7 +1345,7 @@ c_type_print_base (struct type *type, struct ui_file *stream,
tag for unnamed struct/union/enum's, which we don't tag for unnamed struct/union/enum's, which we don't
want to print. */ want to print. */
if (TYPE_TAG_NAME (type) != NULL if (TYPE_TAG_NAME (type) != NULL
&& strncmp (TYPE_TAG_NAME (type), "{unnamed", 8)) && !startswith (TYPE_TAG_NAME (type), "{unnamed"))
{ {
print_name_maybe_canonical (TYPE_TAG_NAME (type), flags, stream); print_name_maybe_canonical (TYPE_TAG_NAME (type), flags, stream);
if (show > 0) if (show > 0)

2
gdb/cli/cli-dump.c
View file

@ -575,7 +575,7 @@ restore_command (char *args_in, int from_tty)
char *binary_string = "binary"; char *binary_string = "binary";
/* Look for optional "binary" flag. */ /* Look for optional "binary" flag. */
if (strncmp (args, binary_string, strlen (binary_string)) == 0) if (startswith (args, binary_string))
{ {
binary_flag = 1; binary_flag = 1;
args += strlen (binary_string); args += strlen (binary_string);

28
gdb/cli/cli-script.c
View file

@ -800,7 +800,7 @@ locate_arg (char *p)
{ {
while ((p = strchr (p, '$'))) while ((p = strchr (p, '$')))
{ {
if (strncmp (p, "$arg", 4) == 0 if (startswith (p, "$arg")
&& (isdigit (p[4]) || p[4] == 'c')) && (isdigit (p[4]) || p[4] == 'c'))
return p; return p;
p++; p++;
@ -988,7 +988,7 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
/* 'end' is always recognized, regardless of parse_commands value. /* 'end' is always recognized, regardless of parse_commands value.
We also permit whitespace before end and after. */ We also permit whitespace before end and after. */
if (p_end - p_start == 3 && !strncmp (p_start, "end", 3)) if (p_end - p_start == 3 && startswith (p_start, "end"))
return end_command; return end_command;
if (parse_commands) if (parse_commands)
@ -1005,14 +1005,14 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
return nop_command; return nop_command;
/* Is the else clause of an if control structure? */ /* Is the else clause of an if control structure? */
if (p_end - p == 4 && !strncmp (p, "else", 4)) if (p_end - p == 4 && startswith (p, "else"))
return else_command; return else_command;
/* Check for while, if, break, continue, etc and build a new /* Check for while, if, break, continue, etc and build a new
command line structure for them. */ command line structure for them. */
if ((p_end - p >= 14 && !strncmp (p, "while-stepping", 14)) if ((p_end - p >= 14 && startswith (p, "while-stepping"))
|| (p_end - p >= 8 && !strncmp (p, "stepping", 8)) || (p_end - p >= 8 && startswith (p, "stepping"))
|| (p_end - p >= 2 && !strncmp (p, "ws", 2))) || (p_end - p >= 2 && startswith (p, "ws")))
{ {
/* Because validate_actionline and encode_action lookup /* Because validate_actionline and encode_action lookup
command's line as command, we need the line to command's line as command, we need the line to
@ -1027,7 +1027,7 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
not. */ not. */
*command = build_command_line (while_stepping_control, p); *command = build_command_line (while_stepping_control, p);
} }
else if (p_end - p > 5 && !strncmp (p, "while", 5)) else if (p_end - p > 5 && startswith (p, "while"))
{ {
char *first_arg; char *first_arg;
@ -1036,7 +1036,7 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
first_arg++; first_arg++;
*command = build_command_line (while_control, first_arg); *command = build_command_line (while_control, first_arg);
} }
else if (p_end - p > 2 && !strncmp (p, "if", 2)) else if (p_end - p > 2 && startswith (p, "if"))
{ {
char *first_arg; char *first_arg;
@ -1045,7 +1045,7 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
first_arg++; first_arg++;
*command = build_command_line (if_control, first_arg); *command = build_command_line (if_control, first_arg);
} }
else if (p_end - p >= 8 && !strncmp (p, "commands", 8)) else if (p_end - p >= 8 && startswith (p, "commands"))
{ {
char *first_arg; char *first_arg;
@ -1054,13 +1054,13 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
first_arg++; first_arg++;
*command = build_command_line (commands_control, first_arg); *command = build_command_line (commands_control, first_arg);
} }
else if (p_end - p == 6 && !strncmp (p, "python", 6)) else if (p_end - p == 6 && startswith (p, "python"))
{ {
/* Note that we ignore the inline "python command" form /* Note that we ignore the inline "python command" form
here. */ here. */
*command = build_command_line (python_control, ""); *command = build_command_line (python_control, "");
} }
else if (p_end - p == 6 && !strncmp (p, "compile", 7)) else if (p_end - p == 6 && startswith (p, "compile"))
{ {
/* Note that we ignore the inline "compile command" form /* Note that we ignore the inline "compile command" form
here. */ here. */
@ -1068,12 +1068,12 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
(*command)->control_u.compile.scope = COMPILE_I_INVALID_SCOPE; (*command)->control_u.compile.scope = COMPILE_I_INVALID_SCOPE;
} }
else if (p_end - p == 5 && !strncmp (p, "guile", 5)) else if (p_end - p == 5 && startswith (p, "guile"))
{ {
/* Note that we ignore the inline "guile command" form here. */ /* Note that we ignore the inline "guile command" form here. */
*command = build_command_line (guile_control, ""); *command = build_command_line (guile_control, "");
} }
else if (p_end - p == 10 && !strncmp (p, "loop_break", 10)) else if (p_end - p == 10 && startswith (p, "loop_break"))
{ {
*command = (struct command_line *) *command = (struct command_line *)
xmalloc (sizeof (struct command_line)); xmalloc (sizeof (struct command_line));
@ -1083,7 +1083,7 @@ process_next_line (char *p, struct command_line **command, int parse_commands,
(*command)->body_count = 0; (*command)->body_count = 0;
(*command)->body_list = NULL; (*command)->body_list = NULL;
} }
else if (p_end - p == 13 && !strncmp (p, "loop_continue", 13)) else if (p_end - p == 13 && startswith (p, "loop_continue"))
{ {
*command = (struct command_line *) *command = (struct command_line *)
xmalloc (sizeof (struct command_line)); xmalloc (sizeof (struct command_line));

30
gdb/coffread.c
View file

@ -231,7 +231,7 @@ coff_locate_sections (bfd *abfd, asection *sectp, void *csip)
csi->textaddr = bfd_section_vma (abfd, sectp); csi->textaddr = bfd_section_vma (abfd, sectp);
csi->textsize += bfd_section_size (abfd, sectp); csi->textsize += bfd_section_size (abfd, sectp);
} }
else if (strncmp (name, ".text", sizeof ".text" - 1) == 0) else if (startswith (name, ".text"))
{ {
csi->textsize += bfd_section_size (abfd, sectp); csi->textsize += bfd_section_size (abfd, sectp);
} }
@ -239,7 +239,7 @@ coff_locate_sections (bfd *abfd, asection *sectp, void *csip)
{ {
csi->stabstrsect = sectp; csi->stabstrsect = sectp;
} }
else if (strncmp (name, ".stab", sizeof ".stab" - 1) == 0) else if (startswith (name, ".stab"))
{ {
const char *s; const char *s;
@ -448,7 +448,7 @@ is_import_fixup_symbol (struct coff_symbol *cs,
return 0; return 0;
/* The name must start with "__fu<digits>__". */ /* The name must start with "__fu<digits>__". */
if (strncmp (cs->c_name, "__fu", 4) != 0) if (!startswith (cs->c_name, "__fu"))
return 0; return 0;
if (! isdigit (cs->c_name[4])) if (! isdigit (cs->c_name[4]))
return 0; return 0;
@ -605,8 +605,8 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
FIXME: We should use BFD to read the symbol table, and thus avoid FIXME: We should use BFD to read the symbol table, and thus avoid
this problem. */ this problem. */
pe_file = pe_file =
strncmp (bfd_get_target (objfile->obfd), "pe", 2) == 0 startswith (bfd_get_target (objfile->obfd), "pe")
|| strncmp (bfd_get_target (objfile->obfd), "epoc-pe", 7) == 0; || startswith (bfd_get_target (objfile->obfd), "epoc-pe");
/* End of warning. */ /* End of warning. */
@ -672,8 +672,8 @@ coff_symfile_read (struct objfile *objfile, int symfile_flags)
symbol in OBJFILE. Note that 'maintenance print msymbols' symbol in OBJFILE. Note that 'maintenance print msymbols'
shows that type of these "_imp_XXXX" symbols is mst_data. */ shows that type of these "_imp_XXXX" symbols is mst_data. */
if (MSYMBOL_TYPE (msym) == mst_data if (MSYMBOL_TYPE (msym) == mst_data
&& (strncmp (name, "__imp_", 6) == 0 && (startswith (name, "__imp_")
|| strncmp (name, "_imp_", 5) == 0)) || startswith (name, "_imp_")))
{ {
const char *name1 = (name[1] == '_' ? &name[7] : &name[6]); const char *name1 = (name[1] == '_' ? &name[7] : &name[6]);
struct bound_minimal_symbol found; struct bound_minimal_symbol found;
@ -946,14 +946,14 @@ coff_symtab_read (long symtab_offset, unsigned int nsyms,
} }
else if (!SDB_TYPE (cs->c_type) else if (!SDB_TYPE (cs->c_type)
&& cs->c_name[0] == 'L' && cs->c_name[0] == 'L'
&& (strncmp (cs->c_name, "LI%", 3) == 0 && (startswith (cs->c_name, "LI%")
|| strncmp (cs->c_name, "LF%", 3) == 0 || startswith (cs->c_name, "LF%")
|| strncmp (cs->c_name, "LC%", 3) == 0 || startswith (cs->c_name, "LC%")
|| strncmp (cs->c_name, "LP%", 3) == 0 || startswith (cs->c_name, "LP%")
|| strncmp (cs->c_name, "LPB%", 4) == 0 || startswith (cs->c_name, "LPB%")
|| strncmp (cs->c_name, "LBB%", 4) == 0 || startswith (cs->c_name, "LBB%")
|| strncmp (cs->c_name, "LBE%", 4) == 0 || startswith (cs->c_name, "LBE%")
|| strncmp (cs->c_name, "LPBX%", 5) == 0)) || startswith (cs->c_name, "LPBX%")))
/* At least on a 3b1, gcc generates swbeg and string labels /* At least on a 3b1, gcc generates swbeg and string labels
that look like this. Ignore them. */ that look like this. Ignore them. */
break; break;

9
gdb/common/common-utils.h
View file

@ -68,4 +68,13 @@ char *savestring (const char *ptr, size_t len);
extern char *safe_strerror (int); extern char *safe_strerror (int);
/* Return non-zero if the start of STRING matches PATTERN, zero
otherwise. */
static inline int
startswith (const char *string, const char *pattern)
{
return strncmp (string, pattern, strlen (pattern)) == 0;
}
#endif #endif

4
gdb/compile/compile.c
View file

@ -172,7 +172,7 @@ do_rmdir (void *arg)
char *zap; char *zap;
int wstat; int wstat;
gdb_assert (strncmp (dir, TMP_PREFIX, strlen (TMP_PREFIX)) == 0); gdb_assert (startswith (dir, TMP_PREFIX));
zap = concat ("rm -rf ", dir, (char *) NULL); zap = concat ("rm -rf ", dir, (char *) NULL);
wstat = system (zap); wstat = system (zap);
if (wstat == -1 || !WIFEXITED (wstat) || WEXITSTATUS (wstat) != 0) if (wstat == -1 || !WIFEXITED (wstat) || WEXITSTATUS (wstat) != 0)
@ -313,7 +313,7 @@ get_selected_pc_producer_options (void)
const char *cs; const char *cs;
if (symtab == NULL || symtab->producer == NULL if (symtab == NULL || symtab->producer == NULL
|| strncmp (symtab->producer, "GNU ", strlen ("GNU ")) != 0) || !startswith (symtab->producer, "GNU "))
return NULL; return NULL;
cs = symtab->producer; cs = symtab->producer;

2
gdb/corelow.c
View file

@ -234,7 +234,7 @@ add_to_thread_list (bfd *abfd, asection *asect, void *reg_sect_arg)
int fake_pid_p = 0; int fake_pid_p = 0;
struct inferior *inf; struct inferior *inf;
if (strncmp (bfd_section_name (abfd, asect), ".reg/", 5) != 0) if (!startswith (bfd_section_name (abfd, asect), ".reg/"))
return; return;
core_tid = atoi (bfd_section_name (abfd, asect) + 5); core_tid = atoi (bfd_section_name (abfd, asect) + 5);

3
gdb/cp-namespace.c
View file

@ -497,8 +497,7 @@ cp_lookup_symbol_via_imports (const char *scope,
len = strlen (current->import_dest); len = strlen (current->import_dest);
directive_match = (search_parents directive_match = (search_parents
? (strncmp (scope, current->import_dest, ? (startswith (scope, current->import_dest)
strlen (current->import_dest)) == 0
&& (len == 0 && (len == 0
|| scope[len] == ':' || scope[len] == ':'
|| scope[len] == '\0')) || scope[len] == '\0'))

14
gdb/dbxread.c
View file

@ -539,12 +539,12 @@ dbx_symfile_read (struct objfile *objfile, int symfile_flags)
differently from Solaris), and false for SunOS4 and other a.out differently from Solaris), and false for SunOS4 and other a.out
file formats. */ file formats. */
block_address_function_relative = block_address_function_relative =
((0 == strncmp (bfd_get_target (sym_bfd), "elf", 3)) ((startswith (bfd_get_target (sym_bfd), "elf"))
|| (0 == strncmp (bfd_get_target (sym_bfd), "som", 3)) || (startswith (bfd_get_target (sym_bfd), "som"))
|| (0 == strncmp (bfd_get_target (sym_bfd), "coff", 4)) || (startswith (bfd_get_target (sym_bfd), "coff"))
|| (0 == strncmp (bfd_get_target (sym_bfd), "pe", 2)) || (startswith (bfd_get_target (sym_bfd), "pe"))
|| (0 == strncmp (bfd_get_target (sym_bfd), "epoc-pe", 7)) || (startswith (bfd_get_target (sym_bfd), "epoc-pe"))
|| (0 == strncmp (bfd_get_target (sym_bfd), "nlm", 3))); || (startswith (bfd_get_target (sym_bfd), "nlm")));
val = bfd_seek (sym_bfd, DBX_SYMTAB_OFFSET (objfile), SEEK_SET); val = bfd_seek (sym_bfd, DBX_SYMTAB_OFFSET (objfile), SEEK_SET);
if (val < 0) if (val < 0)
@ -2547,7 +2547,7 @@ read_ofile_symtab (struct objfile *objfile, struct partial_symtab *pst)
processing_gcc_compilation = 2; processing_gcc_compilation = 2;
if (tempstring[0] == bfd_get_symbol_leading_char (symfile_bfd)) if (tempstring[0] == bfd_get_symbol_leading_char (symfile_bfd))
++tempstring; ++tempstring;
if (strncmp (tempstring, "__gnu_compiled", 14) == 0) if (startswith (tempstring, "__gnu_compiled"))
processing_gcc_compilation = 2; processing_gcc_compilation = 2;
} }
} }

2
gdb/dictionary.c
View file

@ -806,7 +806,7 @@ dict_hash (const char *string0)
string = string0; string = string0;
if (*string == '_') if (*string == '_')
{ {
if (strncmp (string, "_ada_", 5) == 0) if (startswith (string, "_ada_"))
string += 5; string += 5;
else else
return msymbol_hash_iw (string0); return msymbol_hash_iw (string0);

4
gdb/dwarf2-frame.c
View file

@ -878,7 +878,7 @@ dwarf2_frame_find_quirks (struct dwarf2_frame_state *fs,
this problem is fixed (no quirk needed). If the armcc this problem is fixed (no quirk needed). If the armcc
augmentation is missing, the quirk is needed. */ augmentation is missing, the quirk is needed. */
if (fde->cie->version == 3 if (fde->cie->version == 3
&& (strncmp (fde->cie->augmentation, "armcc", 5) != 0 && (!startswith (fde->cie->augmentation, "armcc")
|| strchr (fde->cie->augmentation + 5, '+') == NULL)) || strchr (fde->cie->augmentation + 5, '+') == NULL))
fs->armcc_cfa_offsets_reversed = 1; fs->armcc_cfa_offsets_reversed = 1;
@ -1935,7 +1935,7 @@ decode_frame_entry_1 (struct comp_unit *unit, const gdb_byte *start,
/* Ignore armcc augmentations. We only use them for quirks, /* Ignore armcc augmentations. We only use them for quirks,
and that doesn't happen until later. */ and that doesn't happen until later. */
if (strncmp (augmentation, "armcc", 5) == 0) if (startswith (augmentation, "armcc"))
augmentation += strlen (augmentation); augmentation += strlen (augmentation);
/* The GCC 2.x "eh" augmentation has a pointer immediately /* The GCC 2.x "eh" augmentation has a pointer immediately

17
gdb/dwarf2read.c
View file

@ -12306,7 +12306,7 @@ check_producer (struct dwarf2_cu *cu)
cu->producer_is_gxx_lt_4_6 = major < 4 || (major == 4 && minor < 6); cu->producer_is_gxx_lt_4_6 = major < 4 || (major == 4 && minor < 6);
cu->producer_is_gcc_lt_4_3 = major < 4 || (major == 4 && minor < 3); cu->producer_is_gcc_lt_4_3 = major < 4 || (major == 4 && minor < 3);
} }
else if (strncmp (cu->producer, "Intel(R) C", strlen ("Intel(R) C")) == 0) else if (startswith (cu->producer, "Intel(R) C"))
cu->producer_is_icc = 1; cu->producer_is_icc = 1;
else else
{ {
@ -12987,8 +12987,8 @@ is_vtable_name (const char *name, struct dwarf2_cu *cu)
/* Look for the C++ and Java forms of the vtable. */ /* Look for the C++ and Java forms of the vtable. */
if ((cu->language == language_java if ((cu->language == language_java
&& strncmp (name, vtable, sizeof (vtable) - 1) == 0) && startswith (name, vtable))
|| (strncmp (name, vptr, sizeof (vptr) - 1) == 0 || (startswith (name, vptr)
&& is_cplus_marker (name[sizeof (vptr) - 1]))) && is_cplus_marker (name[sizeof (vptr) - 1])))
return 1; return 1;
@ -13296,8 +13296,7 @@ process_structure_scope (struct die_info *die, struct dwarf2_cu *cu)
} }
} }
else if (cu->producer else if (cu->producer
&& strncmp (cu->producer, && startswith (cu->producer, "IBM(R) XL C/C++ Advanced Edition"))
"IBM(R) XL C/C++ Advanced Edition", 32) == 0)
{ {
/* The IBM XLC compiler does not provide direct indication /* The IBM XLC compiler does not provide direct indication
of the containing type, but the vtable pointer is of the containing type, but the vtable pointer is
@ -14695,7 +14694,7 @@ read_base_type (struct die_info *die, struct dwarf2_cu *cu)
type_flags |= TYPE_FLAG_UNSIGNED; type_flags |= TYPE_FLAG_UNSIGNED;
if (cu->language == language_fortran if (cu->language == language_fortran
&& name && name
&& strncmp (name, "character(", sizeof ("character(") - 1) == 0) && startswith (name, "character("))
code = TYPE_CODE_CHAR; code = TYPE_CODE_CHAR;
break; break;
case DW_ATE_signed_char: case DW_ATE_signed_char:
@ -18262,7 +18261,7 @@ new_symbol_full (struct die_info *die, struct type *type, struct dwarf2_cu *cu,
if (cu->language == language_fortran && die->parent if (cu->language == language_fortran && die->parent
&& die->parent->tag == DW_TAG_module && die->parent->tag == DW_TAG_module
&& cu->producer && cu->producer
&& strncmp (cu->producer, "GNU Fortran ", 12) == 0) && startswith (cu->producer, "GNU Fortran "))
SYMBOL_ACLASS_INDEX (sym) = LOC_UNRESOLVED; SYMBOL_ACLASS_INDEX (sym) = LOC_UNRESOLVED;
/* A variable with DW_AT_external is never static, /* A variable with DW_AT_external is never static,
@ -19339,8 +19338,8 @@ dwarf2_name (struct die_info *die, struct dwarf2_cu *cu)
or simply "<anonymous struct>" or "<anonymous union>" in GCC 4.3 or simply "<anonymous struct>" or "<anonymous union>" in GCC 4.3
and GCC 4.4. We work around this problem by ignoring these. */ and GCC 4.4. We work around this problem by ignoring these. */
if (attr && DW_STRING (attr) if (attr && DW_STRING (attr)
&& (strncmp (DW_STRING (attr), "._", 2) == 0 && (startswith (DW_STRING (attr), "._")
|| strncmp (DW_STRING (attr), "<anonymous", 10) == 0)) || startswith (DW_STRING (attr), "<anonymous")))
return NULL; return NULL;
/* GCC might emit a nameless typedef that has a linkage name. See /* GCC might emit a nameless typedef that has a linkage name. See

2
gdb/elfread.c
View file

@ -322,7 +322,7 @@ elf_symtab_read (struct objfile *objfile, int type,
for that section is ".plt". So, if there is a ".plt" for that section is ".plt". So, if there is a ".plt"
section, and yet the section name of our symbol does not section, and yet the section name of our symbol does not
start with ".plt", we ignore that symbol. */ start with ".plt", we ignore that symbol. */
if (strncmp (sect->name, ".plt", 4) != 0 if (!startswith (sect->name, ".plt")
&& bfd_get_section_by_name (abfd, ".plt") != NULL) && bfd_get_section_by_name (abfd, ".plt") != NULL)
continue; continue;

6
gdb/gcore.c
View file

@ -387,9 +387,9 @@ make_output_phdrs (bfd *obfd, asection *osec, void *ignored)
int p_type = 0; int p_type = 0;
/* FIXME: these constants may only be applicable for ELF. */ /* FIXME: these constants may only be applicable for ELF. */
if (strncmp (bfd_section_name (obfd, osec), "load", 4) == 0) if (startswith (bfd_section_name (obfd, osec), "load"))
p_type = PT_LOAD; p_type = PT_LOAD;
else if (strncmp (bfd_section_name (obfd, osec), "note", 4) == 0) else if (startswith (bfd_section_name (obfd, osec), "note"))
p_type = PT_NOTE; p_type = PT_NOTE;
else else
p_type = PT_NULL; p_type = PT_NULL;
@ -562,7 +562,7 @@ gcore_copy_callback (bfd *obfd, asection *osec, void *ignored)
return; return;
/* Only interested in "load" sections. */ /* Only interested in "load" sections. */
if (strncmp ("load", bfd_section_name (obfd, osec), 4) != 0) if (!startswith (bfd_section_name (obfd, osec), "load"))
return; return;
size = min (total_size, MAX_COPY_BYTES); size = min (total_size, MAX_COPY_BYTES);

12
gdb/gdbserver/hostio.c
View file

@ -511,17 +511,17 @@ handle_readlink (char *own_buf, int *new_packet_len)
int int
handle_vFile (char *own_buf, int packet_len, int *new_packet_len) handle_vFile (char *own_buf, int packet_len, int *new_packet_len)
{ {
if (strncmp (own_buf, "vFile:open:", 11) == 0) if (startswith (own_buf, "vFile:open:"))
handle_open (own_buf); handle_open (own_buf);
else if (strncmp (own_buf, "vFile:pread:", 12) == 0) else if (startswith (own_buf, "vFile:pread:"))
handle_pread (own_buf, new_packet_len); handle_pread (own_buf, new_packet_len);
else if (strncmp (own_buf, "vFile:pwrite:", 13) == 0) else if (startswith (own_buf, "vFile:pwrite:"))
handle_pwrite (own_buf, packet_len); handle_pwrite (own_buf, packet_len);
else if (strncmp (own_buf, "vFile:close:", 12) == 0) else if (startswith (own_buf, "vFile:close:"))
handle_close (own_buf); handle_close (own_buf);
else if (strncmp (own_buf, "vFile:unlink:", 13) == 0) else if (startswith (own_buf, "vFile:unlink:"))
handle_unlink (own_buf); handle_unlink (own_buf);
else if (strncmp (own_buf, "vFile:readlink:", 15) == 0) else if (startswith (own_buf, "vFile:readlink:"))
handle_readlink (own_buf, new_packet_len); handle_readlink (own_buf, new_packet_len);
else else
return 0; return 0;

4
gdb/gdbserver/linux-low.c
View file

@ -5903,9 +5903,9 @@ linux_qxfer_libraries_svr4 (const char *annex, unsigned char *readbuf,
break; break;
len = sep - annex; len = sep - annex;
if (len == 5 && strncmp (annex, "start", 5) == 0) if (len == 5 && startswith (annex, "start"))
addrp = &lm_addr; addrp = &lm_addr;
else if (len == 4 && strncmp (annex, "prev", 4) == 0) else if (len == 4 && startswith (annex, "prev"))
addrp = &lm_prev; addrp = &lm_prev;
else else
{ {

2
gdb/gdbserver/linux-x86-low.c
View file

@ -1523,7 +1523,7 @@ x86_linux_process_qsupported (const char *query)
with "i386" in qSupported query, it supports x86 XML target with "i386" in qSupported query, it supports x86 XML target
descriptions. */ descriptions. */
use_xml = 0; use_xml = 0;
if (query != NULL && strncmp (query, "xmlRegisters=", 13) == 0) if (query != NULL && startswith (query, "xmlRegisters="))
{ {
char *copy = xstrdup (query + 13); char *copy = xstrdup (query + 13);
char *p; char *p;

2
gdb/gdbserver/notif.c
View file

@ -86,7 +86,7 @@ handle_notif_ack (char *own_buf, int packet_len)
{ {
const char *ack_name = notifs[i]->ack_name; const char *ack_name = notifs[i]->ack_name;
if (strncmp (own_buf, ack_name, strlen (ack_name)) == 0 if (startswith (own_buf, ack_name)
&& packet_len == strlen (ack_name)) && packet_len == strlen (ack_name))
break; break;
} }

6
gdb/gdbserver/remote-utils.c
View file

@ -531,7 +531,7 @@ hex_or_minus_one (char *buf, char **obuf)
{ {
ULONGEST ret; ULONGEST ret;
if (strncmp (buf, "-1", 2) == 0) if (startswith (buf, "-1"))
{ {
ret = (ULONGEST) -1; ret = (ULONGEST) -1;
buf += 2; buf += 2;
@ -1447,7 +1447,7 @@ look_up_one_symbol (const char *name, CORE_ADDR *addrp, int may_ask_gdb)
return -1; return -1;
} }
if (strncmp (own_buf, "qSymbol:", strlen ("qSymbol:")) != 0) if (!startswith (own_buf, "qSymbol:"))
{ {
warning ("Malformed response to qSymbol, ignoring: %s\n", own_buf); warning ("Malformed response to qSymbol, ignoring: %s\n", own_buf);
return -1; return -1;
@ -1556,7 +1556,7 @@ relocate_instruction (CORE_ADDR *to, CORE_ADDR oldloc)
return -1; return -1;
} }
if (strncmp (own_buf, "qRelocInsn:", strlen ("qRelocInsn:")) != 0) if (!startswith (own_buf, "qRelocInsn:"))
{ {
warning ("Malformed response to qRelocInsn, ignoring: %s\n", warning ("Malformed response to qRelocInsn, ignoring: %s\n",
own_buf); own_buf);

59
gdb/gdbserver/server.c
View file

@ -429,7 +429,7 @@ handle_btrace_general_set (char *own_buf)
const char *err; const char *err;
char *op; char *op;
if (strncmp ("Qbtrace:", own_buf, strlen ("Qbtrace:")) != 0) if (!startswith (own_buf, "Qbtrace:"))
return 0; return 0;
op = own_buf + strlen ("Qbtrace:"); op = own_buf + strlen ("Qbtrace:");
@ -473,7 +473,7 @@ handle_btrace_conf_general_set (char *own_buf)
struct thread_info *thread; struct thread_info *thread;
char *op; char *op;
if (strncmp ("Qbtrace-conf:", own_buf, strlen ("Qbtrace-conf:")) != 0) if (!startswith (own_buf, "Qbtrace-conf:"))
return 0; return 0;
op = own_buf + strlen ("Qbtrace-conf:"); op = own_buf + strlen ("Qbtrace-conf:");
@ -492,7 +492,7 @@ handle_btrace_conf_general_set (char *own_buf)
return -1; return -1;
} }
if (strncmp (op, "bts:size=", strlen ("bts:size=")) == 0) if (startswith (op, "bts:size="))
{ {
unsigned long size; unsigned long size;
char *endp = NULL; char *endp = NULL;
@ -522,7 +522,7 @@ handle_btrace_conf_general_set (char *own_buf)
static void static void
handle_general_set (char *own_buf) handle_general_set (char *own_buf)
{ {
if (strncmp ("QPassSignals:", own_buf, strlen ("QPassSignals:")) == 0) if (startswith (own_buf, "QPassSignals:"))
{ {
int numsigs = (int) GDB_SIGNAL_LAST, i; int numsigs = (int) GDB_SIGNAL_LAST, i;
const char *p = own_buf + strlen ("QPassSignals:"); const char *p = own_buf + strlen ("QPassSignals:");
@ -547,7 +547,7 @@ handle_general_set (char *own_buf)
return; return;
} }
if (strncmp ("QProgramSignals:", own_buf, strlen ("QProgramSignals:")) == 0) if (startswith (own_buf, "QProgramSignals:"))
{ {
int numsigs = (int) GDB_SIGNAL_LAST, i; int numsigs = (int) GDB_SIGNAL_LAST, i;
const char *p = own_buf + strlen ("QProgramSignals:"); const char *p = own_buf + strlen ("QProgramSignals:");
@ -587,7 +587,7 @@ handle_general_set (char *own_buf)
return; return;
} }
if (strncmp (own_buf, "QNonStop:", 9) == 0) if (startswith (own_buf, "QNonStop:"))
{ {
char *mode = own_buf + 9; char *mode = own_buf + 9;
int req = -1; int req = -1;
@ -624,8 +624,7 @@ handle_general_set (char *own_buf)
return; return;
} }
if (strncmp ("QDisableRandomization:", own_buf, if (startswith (own_buf, "QDisableRandomization:"))
strlen ("QDisableRandomization:")) == 0)
{ {
char *packet = own_buf + strlen ("QDisableRandomization:"); char *packet = own_buf + strlen ("QDisableRandomization:");
ULONGEST setting; ULONGEST setting;
@ -649,7 +648,7 @@ handle_general_set (char *own_buf)
&& handle_tracepoint_general_set (own_buf)) && handle_tracepoint_general_set (own_buf))
return; return;
if (strncmp ("QAgent:", own_buf, strlen ("QAgent:")) == 0) if (startswith (own_buf, "QAgent:"))
{ {
char *mode = own_buf + strlen ("QAgent:"); char *mode = own_buf + strlen ("QAgent:");
int req = 0; int req = 0;
@ -1072,8 +1071,7 @@ handle_monitor_command (char *mon, char *own_buf)
remote_debug = 0; remote_debug = 0;
monitor_output ("Protocol debug output disabled.\n"); monitor_output ("Protocol debug output disabled.\n");
} }
else if (strncmp (mon, "set debug-format ", else if (startswith (mon, "set debug-format "))
sizeof ("set debug-format ") - 1) == 0)
{ {
char *error_msg char *error_msg
= parse_debug_format_options (mon + sizeof ("set debug-format ") - 1, = parse_debug_format_options (mon + sizeof ("set debug-format ") - 1,
@ -1661,7 +1659,7 @@ handle_qxfer (char *own_buf, int packet_len, int *new_packet_len_p)
char *annex; char *annex;
char *offset; char *offset;
if (strncmp (own_buf, "qXfer:", 6) != 0) if (!startswith (own_buf, "qXfer:"))
return 0; return 0;
/* Grab the object, r/w and annex. */ /* Grab the object, r/w and annex. */
@ -1935,7 +1933,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
} }
/* Protocol features query. */ /* Protocol features query. */
if (strncmp ("qSupported", own_buf, 10) == 0 if (startswith (own_buf, "qSupported")
&& (own_buf[10] == ':' || own_buf[10] == '\0')) && (own_buf[10] == ':' || own_buf[10] == '\0'))
{ {
char *p = &own_buf[10]; char *p = &own_buf[10];
@ -2089,7 +2087,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
/* Thread-local storage support. */ /* Thread-local storage support. */
if (the_target->get_tls_address != NULL if (the_target->get_tls_address != NULL
&& strncmp ("qGetTLSAddr:", own_buf, 12) == 0) && startswith (own_buf, "qGetTLSAddr:"))
{ {
char *p = own_buf + 12; char *p = own_buf + 12;
CORE_ADDR parts[2], address = 0; CORE_ADDR parts[2], address = 0;
@ -2154,7 +2152,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
/* Windows OS Thread Information Block address support. */ /* Windows OS Thread Information Block address support. */
if (the_target->get_tib_address != NULL if (the_target->get_tib_address != NULL
&& strncmp ("qGetTIBAddr:", own_buf, 12) == 0) && startswith (own_buf, "qGetTIBAddr:"))
{ {
char *annex; char *annex;
int n; int n;
@ -2176,7 +2174,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
} }
/* Handle "monitor" commands. */ /* Handle "monitor" commands. */
if (strncmp ("qRcmd,", own_buf, 6) == 0) if (startswith (own_buf, "qRcmd,"))
{ {
char *mon = malloc (PBUFSIZ); char *mon = malloc (PBUFSIZ);
int len = strlen (own_buf + 6); int len = strlen (own_buf + 6);
@ -2207,8 +2205,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
return; return;
} }
if (strncmp ("qSearch:memory:", own_buf, if (startswith (own_buf, "qSearch:memory:"))
sizeof ("qSearch:memory:") - 1) == 0)
{ {
require_running (own_buf); require_running (own_buf);
handle_search_memory (own_buf, packet_len); handle_search_memory (own_buf, packet_len);
@ -2216,7 +2213,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
} }
if (strcmp (own_buf, "qAttached") == 0 if (strcmp (own_buf, "qAttached") == 0
|| strncmp (own_buf, "qAttached:", sizeof ("qAttached:") - 1) == 0) || startswith (own_buf, "qAttached:"))
{ {
struct process_info *process; struct process_info *process;
@ -2242,7 +2239,7 @@ handle_query (char *own_buf, int packet_len, int *new_packet_len_p)
return; return;
} }
if (strncmp ("qCRC:", own_buf, 5) == 0) if (startswith (own_buf, "qCRC:"))
{ {
/* CRC check (compare-section). */ /* CRC check (compare-section). */
char *comma; char *comma;
@ -2672,14 +2669,14 @@ handle_v_requests (char *own_buf, int packet_len, int *new_packet_len)
{ {
if (!disable_packet_vCont) if (!disable_packet_vCont)
{ {
if (strncmp (own_buf, "vCont;", 6) == 0) if (startswith (own_buf, "vCont;"))
{ {
require_running (own_buf); require_running (own_buf);
handle_v_cont (own_buf); handle_v_cont (own_buf);
return; return;
} }
if (strncmp (own_buf, "vCont?", 6) == 0) if (startswith (own_buf, "vCont?"))
{ {
strcpy (own_buf, "vCont;c;C;s;S;t"); strcpy (own_buf, "vCont;c;C;s;S;t");
if (target_supports_range_stepping ()) if (target_supports_range_stepping ())
@ -2691,11 +2688,11 @@ handle_v_requests (char *own_buf, int packet_len, int *new_packet_len)
} }
} }
if (strncmp (own_buf, "vFile:", 6) == 0 if (startswith (own_buf, "vFile:")
&& handle_vFile (own_buf, packet_len, new_packet_len)) && handle_vFile (own_buf, packet_len, new_packet_len))
return; return;
if (strncmp (own_buf, "vAttach;", 8) == 0) if (startswith (own_buf, "vAttach;"))
{ {
if ((!extended_protocol || !multi_process) && target_running ()) if ((!extended_protocol || !multi_process) && target_running ())
{ {
@ -2707,7 +2704,7 @@ handle_v_requests (char *own_buf, int packet_len, int *new_packet_len)
return; return;
} }
if (strncmp (own_buf, "vRun;", 5) == 0) if (startswith (own_buf, "vRun;"))
{ {
if ((!extended_protocol || !multi_process) && target_running ()) if ((!extended_protocol || !multi_process) && target_running ())
{ {
@ -2719,7 +2716,7 @@ handle_v_requests (char *own_buf, int packet_len, int *new_packet_len)
return; return;
} }
if (strncmp (own_buf, "vKill;", 6) == 0) if (startswith (own_buf, "vKill;"))
{ {
if (!target_running ()) if (!target_running ())
{ {
@ -3211,9 +3208,7 @@ captured_main (int argc, char *argv[])
} }
else if (strcmp (*next_arg, "--debug") == 0) else if (strcmp (*next_arg, "--debug") == 0)
debug_threads = 1; debug_threads = 1;
else if (strncmp (*next_arg, else if (startswith (*next_arg, "--debug-format="))
"--debug-format=",
sizeof ("--debug-format=") - 1) == 0)
{ {
char *error_msg char *error_msg
= parse_debug_format_options ((*next_arg) = parse_debug_format_options ((*next_arg)
@ -3232,9 +3227,7 @@ captured_main (int argc, char *argv[])
gdbserver_show_disableable (stdout); gdbserver_show_disableable (stdout);
exit (0); exit (0);
} }
else if (strncmp (*next_arg, else if (startswith (*next_arg, "--disable-packet="))
"--disable-packet=",
sizeof ("--disable-packet=") - 1) == 0)
{ {
char *packets, *tok; char *packets, *tok;
@ -3533,7 +3526,7 @@ process_point_options (struct breakpoint *bp, char **packet)
if (!add_breakpoint_condition (bp, &dataptr)) if (!add_breakpoint_condition (bp, &dataptr))
skip_to_semicolon (&dataptr); skip_to_semicolon (&dataptr);
} }
else if (strncmp (dataptr, "cmds:", strlen ("cmds:")) == 0) else if (startswith (dataptr, "cmds:"))
{ {
dataptr += strlen ("cmds:"); dataptr += strlen ("cmds:");
if (debug_threads) if (debug_threads)

63
gdb/gdbserver/tracepoint.c
View file

@ -3551,14 +3551,14 @@ cmd_qtframe (char *own_buf)
packet += strlen ("QTFrame:"); packet += strlen ("QTFrame:");
if (strncmp (packet, "pc:", strlen ("pc:")) == 0) if (startswith (packet, "pc:"))
{ {
packet += strlen ("pc:"); packet += strlen ("pc:");
unpack_varlen_hex (packet, &pc); unpack_varlen_hex (packet, &pc);
trace_debug ("Want to find next traceframe at pc=0x%s", paddress (pc)); trace_debug ("Want to find next traceframe at pc=0x%s", paddress (pc));
tframe = find_next_traceframe_in_range (pc, pc, 1, &tfnum); tframe = find_next_traceframe_in_range (pc, pc, 1, &tfnum);
} }
else if (strncmp (packet, "range:", strlen ("range:")) == 0) else if (startswith (packet, "range:"))
{ {
packet += strlen ("range:"); packet += strlen ("range:");
packet = unpack_varlen_hex (packet, &lo); packet = unpack_varlen_hex (packet, &lo);
@ -3568,7 +3568,7 @@ cmd_qtframe (char *own_buf)
paddress (lo), paddress (hi)); paddress (lo), paddress (hi));
tframe = find_next_traceframe_in_range (lo, hi, 1, &tfnum); tframe = find_next_traceframe_in_range (lo, hi, 1, &tfnum);
} }
else if (strncmp (packet, "outside:", strlen ("outside:")) == 0) else if (startswith (packet, "outside:"))
{ {
packet += strlen ("outside:"); packet += strlen ("outside:");
packet = unpack_varlen_hex (packet, &lo); packet = unpack_varlen_hex (packet, &lo);
@ -3579,7 +3579,7 @@ cmd_qtframe (char *own_buf)
paddress (lo), paddress (hi)); paddress (lo), paddress (hi));
tframe = find_next_traceframe_in_range (lo, hi, 0, &tfnum); tframe = find_next_traceframe_in_range (lo, hi, 0, &tfnum);
} }
else if (strncmp (packet, "tdp:", strlen ("tdp:")) == 0) else if (startswith (packet, "tdp:"))
{ {
packet += strlen ("tdp:"); packet += strlen ("tdp:");
unpack_varlen_hex (packet, &num); unpack_varlen_hex (packet, &num);
@ -3653,7 +3653,7 @@ cmd_qtstatus (char *packet)
/* The user visible error string in terror needs to be hex encoded. /* The user visible error string in terror needs to be hex encoded.
We leave it as plain string in `tracing_stop_reason' to ease We leave it as plain string in `tracing_stop_reason' to ease
debugging. */ debugging. */
if (strncmp (stop_reason_rsp, "terror:", strlen ("terror:")) == 0) if (startswith (stop_reason_rsp, "terror:"))
{ {
const char *result_name; const char *result_name;
int hexstr_len; int hexstr_len;
@ -4106,7 +4106,7 @@ cmd_qtnotes (char *own_buf)
while (*packet) while (*packet)
{ {
if (strncmp ("user:", packet, strlen ("user:")) == 0) if (startswith (packet, "user:"))
{ {
packet += strlen ("user:"); packet += strlen ("user:");
saved = packet; saved = packet;
@ -4120,7 +4120,7 @@ cmd_qtnotes (char *own_buf)
xfree (tracing_user_name); xfree (tracing_user_name);
tracing_user_name = user; tracing_user_name = user;
} }
else if (strncmp ("notes:", packet, strlen ("notes:")) == 0) else if (startswith (packet, "notes:"))
{ {
packet += strlen ("notes:"); packet += strlen ("notes:");
saved = packet; saved = packet;
@ -4134,7 +4134,7 @@ cmd_qtnotes (char *own_buf)
xfree (tracing_notes); xfree (tracing_notes);
tracing_notes = notes; tracing_notes = notes;
} }
else if (strncmp ("tstop:", packet, strlen ("tstop:")) == 0) else if (startswith (packet, "tstop:"))
{ {
packet += strlen ("tstop:"); packet += strlen ("tstop:");
saved = packet; saved = packet;
@ -4163,32 +4163,32 @@ handle_tracepoint_general_set (char *packet)
cmd_qtinit (packet); cmd_qtinit (packet);
return 1; return 1;
} }
else if (strncmp ("QTDP:", packet, strlen ("QTDP:")) == 0) else if (startswith (packet, "QTDP:"))
{ {
cmd_qtdp (packet); cmd_qtdp (packet);
return 1; return 1;
} }
else if (strncmp ("QTDPsrc:", packet, strlen ("QTDPsrc:")) == 0) else if (startswith (packet, "QTDPsrc:"))
{ {
cmd_qtdpsrc (packet); cmd_qtdpsrc (packet);
return 1; return 1;
} }
else if (strncmp ("QTEnable:", packet, strlen ("QTEnable:")) == 0) else if (startswith (packet, "QTEnable:"))
{ {
cmd_qtenable_disable (packet, 1); cmd_qtenable_disable (packet, 1);
return 1; return 1;
} }
else if (strncmp ("QTDisable:", packet, strlen ("QTDisable:")) == 0) else if (startswith (packet, "QTDisable:"))
{ {
cmd_qtenable_disable (packet, 0); cmd_qtenable_disable (packet, 0);
return 1; return 1;
} }
else if (strncmp ("QTDV:", packet, strlen ("QTDV:")) == 0) else if (startswith (packet, "QTDV:"))
{ {
cmd_qtdv (packet); cmd_qtdv (packet);
return 1; return 1;
} }
else if (strncmp ("QTro:", packet, strlen ("QTro:")) == 0) else if (startswith (packet, "QTro:"))
{ {
cmd_qtro (packet); cmd_qtro (packet);
return 1; return 1;
@ -4203,28 +4203,27 @@ handle_tracepoint_general_set (char *packet)
cmd_qtstop (packet); cmd_qtstop (packet);
return 1; return 1;
} }
else if (strncmp ("QTDisconnected:", packet, else if (startswith (packet, "QTDisconnected:"))
strlen ("QTDisconnected:")) == 0)
{ {
cmd_qtdisconnected (packet); cmd_qtdisconnected (packet);
return 1; return 1;
} }
else if (strncmp ("QTFrame:", packet, strlen ("QTFrame:")) == 0) else if (startswith (packet, "QTFrame:"))
{ {
cmd_qtframe (packet); cmd_qtframe (packet);
return 1; return 1;
} }
else if (strncmp ("QTBuffer:circular:", packet, strlen ("QTBuffer:circular:")) == 0) else if (startswith (packet, "QTBuffer:circular:"))
{ {
cmd_bigqtbuffer_circular (packet); cmd_bigqtbuffer_circular (packet);
return 1; return 1;
} }
else if (strncmp ("QTBuffer:size:", packet, strlen ("QTBuffer:size:")) == 0) else if (startswith (packet, "QTBuffer:size:"))
{ {
cmd_bigqtbuffer_size (packet); cmd_bigqtbuffer_size (packet);
return 1; return 1;
} }
else if (strncmp ("QTNotes:", packet, strlen ("QTNotes:")) == 0) else if (startswith (packet, "QTNotes:"))
{ {
cmd_qtnotes (packet); cmd_qtnotes (packet);
return 1; return 1;
@ -4241,7 +4240,7 @@ handle_tracepoint_query (char *packet)
cmd_qtstatus (packet); cmd_qtstatus (packet);
return 1; return 1;
} }
else if (strncmp ("qTP:", packet, strlen ("qTP:")) == 0) else if (startswith (packet, "qTP:"))
{ {
cmd_qtp (packet); cmd_qtp (packet);
return 1; return 1;
@ -4266,12 +4265,12 @@ handle_tracepoint_query (char *packet)
cmd_qtsv (packet); cmd_qtsv (packet);
return 1; return 1;
} }
else if (strncmp ("qTV:", packet, strlen ("qTV:")) == 0) else if (startswith (packet, "qTV:"))
{ {
cmd_qtv (packet); cmd_qtv (packet);
return 1; return 1;
} }
else if (strncmp ("qTBuffer:", packet, strlen ("qTBuffer:")) == 0) else if (startswith (packet, "qTBuffer:"))
{ {
cmd_qtbuffer (packet); cmd_qtbuffer (packet);
return 1; return 1;
@ -4286,7 +4285,7 @@ handle_tracepoint_query (char *packet)
cmd_qtsstm (packet); cmd_qtsstm (packet);
return 1; return 1;
} }
else if (strncmp ("qTSTMat:", packet, strlen ("qTSTMat:")) == 0) else if (startswith (packet, "qTSTMat:"))
{ {
cmd_qtstmat (packet); cmd_qtstmat (packet);
return 1; return 1;
@ -6123,7 +6122,7 @@ tracepoint_send_agent (struct tracepoint *tpoint)
if (ret) if (ret)
return ret; return ret;
if (strncmp (buf, "OK", 2) != 0) if (!startswith (buf, "OK"))
return 1; return 1;
/* The value of tracepoint's target address is stored in BUF. */ /* The value of tracepoint's target address is stored in BUF. */
@ -7202,7 +7201,7 @@ gdb_agent_helper_thread (void *arg)
if (cmd_buf[0]) if (cmd_buf[0])
{ {
if (strncmp ("close", cmd_buf, 5) == 0) if (startswith (cmd_buf, "close"))
{ {
stop_loop = 1; stop_loop = 1;
} }
@ -7215,21 +7214,15 @@ gdb_agent_helper_thread (void *arg)
{ {
cmd_qtsstm (cmd_buf); cmd_qtsstm (cmd_buf);
} }
else if (strncmp ("unprobe_marker_at:", else if (startswith (cmd_buf, "unprobe_marker_at:"))
cmd_buf,
sizeof ("unprobe_marker_at:") - 1) == 0)
{ {
unprobe_marker_at (cmd_buf); unprobe_marker_at (cmd_buf);
} }
else if (strncmp ("probe_marker_at:", else if (startswith (cmd_buf, "probe_marker_at:"))
cmd_buf,
sizeof ("probe_marker_at:") - 1) == 0)
{ {
probe_marker_at (cmd_buf); probe_marker_at (cmd_buf);
} }
else if (strncmp ("qTSTMat:", else if (startswith (cmd_buf, "qTSTMat:"))
cmd_buf,
sizeof ("qTSTMat:") - 1) == 0)
{ {
cmd_qtstmat (cmd_buf); cmd_qtstmat (cmd_buf);
} }

2
gdb/gdbserver/win32-low.c
View file

@ -778,7 +778,7 @@ handle_output_debug_string (struct target_waitstatus *ourstatus)
return; return;
} }
if (strncmp (s, "cYg", 3) != 0) if (!startswith (s, "cYg"))
{ {
if (!server_waiting) if (!server_waiting)
{ {

4
gdb/gdbtypes.c
View file

@ -2376,7 +2376,7 @@ check_stub_method (struct type *type, int method_id, int signature_id)
} }
/* If we read one argument and it was ``void'', don't count it. */ /* If we read one argument and it was ``void'', don't count it. */
if (strncmp (argtypetext, "(void)", 6) == 0) if (startswith (argtypetext, "(void)"))
argcount -= 1; argcount -= 1;
/* We need one extra slot, for the THIS pointer. */ /* We need one extra slot, for the THIS pointer. */
@ -2471,7 +2471,7 @@ check_stub_method_group (struct type *type, int method_id)
Therefore the only thing we need to handle here are v2 operator Therefore the only thing we need to handle here are v2 operator
names. */ names. */
if (found_stub && strncmp (TYPE_FN_FIELD_PHYSNAME (f, 0), "_Z", 2) != 0) if (found_stub && !startswith (TYPE_FN_FIELD_PHYSNAME (f, 0), "_Z"))
{ {
int ret; int ret;
char dem_opname[256]; char dem_opname[256];

6
gdb/gnu-v2-abi.c
View file

@ -37,7 +37,7 @@ static enum dtor_kinds
gnuv2_is_destructor_name (const char *name) gnuv2_is_destructor_name (const char *name)
{ {
if ((name[0] == '_' && is_cplus_marker (name[1]) && name[2] == '_') if ((name[0] == '_' && is_cplus_marker (name[1]) && name[2] == '_')
|| strncmp (name, "__dt__", 6) == 0) || startswith (name, "__dt__"))
return complete_object_dtor; return complete_object_dtor;
else else
return 0; return 0;
@ -48,7 +48,7 @@ gnuv2_is_constructor_name (const char *name)
{ {
if ((name[0] == '_' && name[1] == '_' if ((name[0] == '_' && name[1] == '_'
&& (isdigit (name[2]) || strchr ("Qt", name[2]))) && (isdigit (name[2]) || strchr ("Qt", name[2])))
|| strncmp (name, "__ct__", 6) == 0) || startswith (name, "__ct__"))
return complete_object_ctor; return complete_object_ctor;
else else
return 0; return 0;
@ -68,7 +68,7 @@ gnuv2_is_vtable_name (const char *name)
static int static int
gnuv2_is_operator_name (const char *name) gnuv2_is_operator_name (const char *name)
{ {
return strncmp (name, "operator", 8) == 0; return startswith (name, "operator");
} }

6
gdb/gnu-v3-abi.c
View file

@ -39,13 +39,13 @@ static struct gdbarch_data *std_type_info_gdbarch_data;
static int static int
gnuv3_is_vtable_name (const char *name) gnuv3_is_vtable_name (const char *name)
{ {
return strncmp (name, "_ZTV", 4) == 0; return startswith (name, "_ZTV");
} }
static int static int
gnuv3_is_operator_name (const char *name) gnuv3_is_operator_name (const char *name)
{ {
return strncmp (name, "operator", 8) == 0; return startswith (name, "operator");
} }
@ -330,7 +330,7 @@ gnuv3_rtti_type (struct value *value,
should work just as well, and doesn't read target memory. */ should work just as well, and doesn't read target memory. */
vtable_symbol_name = MSYMBOL_DEMANGLED_NAME (vtable_symbol); vtable_symbol_name = MSYMBOL_DEMANGLED_NAME (vtable_symbol);
if (vtable_symbol_name == NULL if (vtable_symbol_name == NULL
|| strncmp (vtable_symbol_name, "vtable for ", 11)) || !startswith (vtable_symbol_name, "vtable for "))
{ {
warning (_("can't find linker symbol for virtual table for `%s' value"), warning (_("can't find linker symbol for virtual table for `%s' value"),
TYPE_SAFE_NAME (values_type)); TYPE_SAFE_NAME (values_type));

4
gdb/go-lang.c
View file

@ -233,8 +233,8 @@ unpack_mangled_go_symbol (const char *mangled_name,
libgo_.*: used by gccgo's runtime libgo_.*: used by gccgo's runtime
Thus we don't support -fgo-prefix (except as used by the runtime). */ Thus we don't support -fgo-prefix (except as used by the runtime). */
if (strncmp (mangled_name, "go.", 3) != 0 if (!startswith (mangled_name, "go.")
&& strncmp (mangled_name, "libgo_", 6) != 0) && !startswith (mangled_name, "libgo_"))
return NULL; return NULL;
/* Quick check for whether a search may be fruitful. */ /* Quick check for whether a search may be fruitful. */

6
gdb/guile/scm-type.c
View file

@ -1216,11 +1216,11 @@ tyscm_lookup_typename (const char *type_name, const struct block *block)
TRY_CATCH (except, RETURN_MASK_ALL) TRY_CATCH (except, RETURN_MASK_ALL)
{ {
if (!strncmp (type_name, "struct ", 7)) if (startswith (type_name, "struct "))
type = lookup_struct (type_name + 7, NULL); type = lookup_struct (type_name + 7, NULL);
else if (!strncmp (type_name, "union ", 6)) else if (startswith (type_name, "union "))
type = lookup_union (type_name + 6, NULL); type = lookup_union (type_name + 6, NULL);
else if (!strncmp (type_name, "enum ", 5)) else if (startswith (type_name, "enum "))
type = lookup_enum (type_name + 5, NULL); type = lookup_enum (type_name + 5, NULL);
else else
type = lookup_typename (current_language, get_current_arch (), type = lookup_typename (current_language, get_current_arch (),

2
gdb/i386-cygwin-tdep.c
View file

@ -107,7 +107,7 @@ core_process_module_section (bfd *abfd, asection *sect, void *obj)
gdb_byte *buf = NULL; gdb_byte *buf = NULL;
if (strncmp (sect->name, ".module", 7) != 0) if (!startswith (sect->name, ".module"))
return; return;
buf = xmalloc (bfd_get_section_size (sect) + 1); buf = xmalloc (bfd_get_section_size (sect) + 1);

7
gdb/i386-tdep.c
View file

@ -1824,8 +1824,7 @@ i386_skip_prologue (struct gdbarch *gdbarch, CORE_ADDR start_pc)
if (post_prologue_pc if (post_prologue_pc
&& (cust != NULL && (cust != NULL
&& COMPUNIT_PRODUCER (cust) != NULL && COMPUNIT_PRODUCER (cust) != NULL
&& strncmp (COMPUNIT_PRODUCER (cust), "clang ", && startswith (COMPUNIT_PRODUCER (cust), "clang ")))
sizeof ("clang ") - 1) == 0))
return max (start_pc, post_prologue_pc); return max (start_pc, post_prologue_pc);
} }
@ -3854,8 +3853,8 @@ i386_pe_skip_trampoline_code (struct frame_info *frame,
if (symname) if (symname)
{ {
if (strncmp (symname, "__imp_", 6) == 0 if (startswith (symname, "__imp_")
|| strncmp (symname, "_imp_", 5) == 0) || startswith (symname, "_imp_"))
return name ? 1 : return name ? 1 :
read_memory_unsigned_integer (indirect, 4, byte_order); read_memory_unsigned_integer (indirect, 4, byte_order);
} }

6
gdb/i386obsd-tdep.c
View file

@ -357,7 +357,7 @@ i386obsd_trapframe_cache (struct frame_info *this_frame, void **this_cache)
sp = get_frame_register_unsigned (this_frame, I386_ESP_REGNUM); sp = get_frame_register_unsigned (this_frame, I386_ESP_REGNUM);
find_pc_partial_function (func, &name, NULL, NULL); find_pc_partial_function (func, &name, NULL, NULL);
if (name && strncmp (name, "Xintr", 5) == 0) if (name && startswith (name, "Xintr"))
addr = sp + 8; /* It's an interrupt frame. */ addr = sp + 8; /* It's an interrupt frame. */
else else
addr = sp; addr = sp;
@ -420,8 +420,8 @@ i386obsd_trapframe_sniffer (const struct frame_unwind *self,
find_pc_partial_function (get_frame_pc (this_frame), &name, NULL, NULL); find_pc_partial_function (get_frame_pc (this_frame), &name, NULL, NULL);
return (name && (strcmp (name, "calltrap") == 0 return (name && (strcmp (name, "calltrap") == 0
|| strcmp (name, "syscall1") == 0 || strcmp (name, "syscall1") == 0
|| strncmp (name, "Xintr", 5) == 0 || startswith (name, "Xintr")
|| strncmp (name, "Xsoft", 5) == 0)); || startswith (name, "Xsoft")));
} }
static const struct frame_unwind i386obsd_trapframe_unwind = { static const struct frame_unwind i386obsd_trapframe_unwind = {

4
gdb/infcmd.c
View file

@ -791,7 +791,7 @@ continue_command (char *args, int from_tty)
if (args != NULL) if (args != NULL)
{ {
if (strncmp (args, "-a", sizeof ("-a") - 1) == 0) if (startswith (args, "-a"))
{ {
all_threads = 1; all_threads = 1;
args += sizeof ("-a") - 1; args += sizeof ("-a") - 1;
@ -2870,7 +2870,7 @@ interrupt_command (char *args, int from_tty)
dont_repeat (); /* Not for the faint of heart. */ dont_repeat (); /* Not for the faint of heart. */
if (args != NULL if (args != NULL
&& strncmp (args, "-a", sizeof ("-a") - 1) == 0) && startswith (args, "-a"))
all_threads = 1; all_threads = 1;
if (!non_stop && all_threads) if (!non_stop && all_threads)

4
gdb/jv-typeprint.c
View file

@ -168,12 +168,12 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show,
{ {
QUIT; QUIT;
/* Don't print out virtual function table. */ /* Don't print out virtual function table. */
if (strncmp (TYPE_FIELD_NAME (type, i), "_vptr", 5) == 0 if (startswith (TYPE_FIELD_NAME (type, i), "_vptr")
&& is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5])) && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
continue; continue;
/* Don't print the dummy field "class". */ /* Don't print the dummy field "class". */
if (strncmp (TYPE_FIELD_NAME (type, i), "class", 5) == 0) if (startswith (TYPE_FIELD_NAME (type, i), "class"))
continue; continue;
print_spaces_filtered (level + 4, stream); print_spaces_filtered (level + 4, stream);

11
gdb/linespec.c
View file

@ -454,8 +454,7 @@ is_ada_operator (const char *string)
for (mapping = ada_opname_table; for (mapping = ada_opname_table;
mapping->encoded != NULL mapping->encoded != NULL
&& strncmp (mapping->decoded, string, && !startswith (string, mapping->decoded); ++mapping)
strlen (mapping->decoded)) != 0; ++mapping)
; ;
return mapping->decoded == NULL ? 0 : strlen (mapping->decoded); return mapping->decoded == NULL ? 0 : strlen (mapping->decoded);
@ -1122,9 +1121,9 @@ find_methods (struct type *t, const char *name,
const char *method_name = TYPE_FN_FIELDLIST_NAME (t, method_counter); const char *method_name = TYPE_FN_FIELDLIST_NAME (t, method_counter);
char dem_opname[64]; char dem_opname[64];
if (strncmp (method_name, "__", 2) == 0 || if (startswith (method_name, "__") ||
strncmp (method_name, "op", 2) == 0 || startswith (method_name, "op") ||
strncmp (method_name, "type", 4) == 0) startswith (method_name, "type"))
{ {
if (cplus_demangle_opname (method_name, dem_opname, DMGL_ANSI)) if (cplus_demangle_opname (method_name, dem_opname, DMGL_ANSI))
method_name = dem_opname; method_name = dem_opname;
@ -1210,7 +1209,7 @@ find_toplevel_string (const char *haystack, const char *needle)
if (s != NULL) if (s != NULL)
{ {
/* Found first char in HAYSTACK; check rest of string. */ /* Found first char in HAYSTACK; check rest of string. */
if (strncmp (s, needle, strlen (needle)) == 0) if (startswith (s, needle))
return s; return s;
/* Didn't find it; loop over HAYSTACK, looking for the next /* Didn't find it; loop over HAYSTACK, looking for the next

8
gdb/linux-nat.c
View file

@ -4215,13 +4215,13 @@ linux_proc_pending_signals (int pid, sigset_t *pending,
Unfortunately some Red Hat kernels include the shared pending Unfortunately some Red Hat kernels include the shared pending
queue but not the ShdPnd status field. */ queue but not the ShdPnd status field. */
if (strncmp (buffer, "SigPnd:\t", 8) == 0) if (startswith (buffer, "SigPnd:\t"))
add_line_to_sigset (buffer + 8, pending); add_line_to_sigset (buffer + 8, pending);
else if (strncmp (buffer, "ShdPnd:\t", 8) == 0) else if (startswith (buffer, "ShdPnd:\t"))
add_line_to_sigset (buffer + 8, pending); add_line_to_sigset (buffer + 8, pending);
else if (strncmp (buffer, "SigBlk:\t", 8) == 0) else if (startswith (buffer, "SigBlk:\t"))
add_line_to_sigset (buffer + 8, blocked); add_line_to_sigset (buffer + 8, blocked);
else if (strncmp (buffer, "SigIgn:\t", 8) == 0) else if (startswith (buffer, "SigIgn:\t"))
add_line_to_sigset (buffer + 8, ignored); add_line_to_sigset (buffer + 8, ignored);
} }

2
gdb/m2-typeprint.c
View file

@ -538,7 +538,7 @@ m2_record_fields (struct type *type, struct ui_file *stream, int show,
/* Print the tag if it exists. */ /* Print the tag if it exists. */
if (TYPE_TAG_NAME (type) != NULL) if (TYPE_TAG_NAME (type) != NULL)
{ {
if (strncmp (TYPE_TAG_NAME (type), "$$", 2) != 0) if (!startswith (TYPE_TAG_NAME (type), "$$"))
{ {
fputs_filtered (TYPE_TAG_NAME (type), stream); fputs_filtered (TYPE_TAG_NAME (type), stream);
if (show > 0) if (show > 0)

2
gdb/m32r-rom.c
View file

@ -447,7 +447,7 @@ m32r_upload_command (char *args, int from_tty)
myIPaddress = skip_spaces (myIPaddress); myIPaddress = skip_spaces (myIPaddress);
if (!strncmp (myIPaddress, "0.0.", 4)) /* empty */ if (startswith (myIPaddress, "0.0.")) /* empty */
error (_("Please use 'set board-address' to " error (_("Please use 'set board-address' to "
"set the M32R-EVA board's IP address.")); "set the M32R-EVA board's IP address."));
if (strchr (myIPaddress, '(')) if (strchr (myIPaddress, '('))

2
gdb/machoread.c
View file

@ -1004,7 +1004,7 @@ macho_symfile_offsets (struct objfile *objfile,
const char *bfd_sect_name = osect->the_bfd_section->name; const char *bfd_sect_name = osect->the_bfd_section->name;
int sect_index = osect - objfile->sections;; int sect_index = osect - objfile->sections;;
if (strncmp (bfd_sect_name, "LC_SEGMENT.", 11) == 0) if (startswith (bfd_sect_name, "LC_SEGMENT."))
bfd_sect_name += 11; bfd_sect_name += 11;
if (strcmp (bfd_sect_name, "__TEXT") == 0 if (strcmp (bfd_sect_name, "__TEXT") == 0
|| strcmp (bfd_sect_name, "__TEXT.__text") == 0) || strcmp (bfd_sect_name, "__TEXT.__text") == 0)

4
gdb/macrocmd.c
View file

@ -325,7 +325,7 @@ extract_identifier (char **expp, int is_parameter)
char *p = *expp; char *p = *expp;
unsigned int len; unsigned int len;
if (is_parameter && !strncmp (p, "...", 3)) if (is_parameter && startswith (p, "..."))
{ {
/* Ok. */ /* Ok. */
} }
@ -339,7 +339,7 @@ extract_identifier (char **expp, int is_parameter)
; ;
} }
if (is_parameter && !strncmp (p, "...", 3)) if (is_parameter && startswith (p, "..."))
p += 3; p += 3;
len = p - *expp; len = p - *expp;

4
gdb/microblaze-rom.c
View file

@ -83,7 +83,7 @@ picobug_dumpregs (struct regcache *regcache)
if (strchr (p, '-')) if (strchr (p, '-'))
{ {
/* Got a range. Either r0-r7, r8-r15 or ss0-ss4. */ /* Got a range. Either r0-r7, r8-r15 or ss0-ss4. */
if (strncmp (p, "r0", 2) == 0 || strncmp (p, "r8", 2) == 0) if (startswith (p, "r0") || startswith (p, "r8"))
{ {
int rn = (p[1] == '0' ? 0 : 8); int rn = (p[1] == '0' ? 0 : 8);
int i = 0; int i = 0;
@ -97,7 +97,7 @@ picobug_dumpregs (struct regcache *regcache)
i++; i++;
} }
} }
else if (strncmp (p, "ss", 2) == 0) else if (startswith (p, "ss"))
{ {
/* Get the next five values, ignoring the first. */ /* Get the next five values, ignoring the first. */
int rn; int rn;

2
gdb/minsyms.c
View file

@ -996,7 +996,7 @@ prim_record_minimal_symbol_full (const char *name, int name_len, int copy_name,
--name_len; --name_len;
} }
if (ms_type == mst_file_text && strncmp (name, "__gnu_compiled", 14) == 0) if (ms_type == mst_file_text && startswith (name, "__gnu_compiled"))
return (NULL); return (NULL);
if (msym_bunch_index == BUNCH_SIZE) if (msym_bunch_index == BUNCH_SIZE)

2
gdb/mips-sde-tdep.c
View file

@ -212,7 +212,7 @@ mips_sde_elf_osabi_sniff_abi_tag_sections (bfd *abfd, asection *sect,
/* The presence of a section with a ".sde" prefix is indicative /* The presence of a section with a ".sde" prefix is indicative
of an SDE binary. */ of an SDE binary. */
if (strncmp (name, ".sde", 4) == 0) if (startswith (name, ".sde"))
*os_ident_ptr = GDB_OSABI_SDE; *os_ident_ptr = GDB_OSABI_SDE;
} }

23
gdb/mips-tdep.c
View file

@ -1345,14 +1345,13 @@ mips_in_frame_stub (CORE_ADDR pc)
return 0; return 0;
/* If the PC is in __mips16_call_stub_*, this is a call/return stub. */ /* If the PC is in __mips16_call_stub_*, this is a call/return stub. */
if (strncmp (name, mips_str_mips16_call_stub, if (startswith (name, mips_str_mips16_call_stub))
strlen (mips_str_mips16_call_stub)) == 0)
return 1; return 1;
/* If the PC is in __call_stub_*, this is a call/return or a call stub. */ /* If the PC is in __call_stub_*, this is a call/return or a call stub. */
if (strncmp (name, mips_str_call_stub, strlen (mips_str_call_stub)) == 0) if (startswith (name, mips_str_call_stub))
return 1; return 1;
/* If the PC is in __fn_stub_*, this is a call stub. */ /* If the PC is in __fn_stub_*, this is a call stub. */
if (strncmp (name, mips_str_fn_stub, strlen (mips_str_fn_stub)) == 0) if (startswith (name, mips_str_fn_stub))
return 1; return 1;
return 0; /* Not a stub. */ return 0; /* Not a stub. */
@ -3813,7 +3812,7 @@ mips_stub_frame_sniffer (const struct frame_unwind *self,
msym = lookup_minimal_symbol_by_pc (pc); msym = lookup_minimal_symbol_by_pc (pc);
if (msym.minsym != NULL if (msym.minsym != NULL
&& MSYMBOL_LINKAGE_NAME (msym.minsym) != NULL && MSYMBOL_LINKAGE_NAME (msym.minsym) != NULL
&& strncmp (MSYMBOL_LINKAGE_NAME (msym.minsym), ".pic.", 5) == 0) && startswith (MSYMBOL_LINKAGE_NAME (msym.minsym), ".pic."))
return 1; return 1;
return 0; return 0;
@ -7846,8 +7845,8 @@ mips_skip_mips16_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
/* If the PC is in __call_stub_* or __fn_stub*, this is one of the /* If the PC is in __call_stub_* or __fn_stub*, this is one of the
compiler-generated call or call/return stubs. */ compiler-generated call or call/return stubs. */
if (strncmp (name, mips_str_fn_stub, strlen (mips_str_fn_stub)) == 0 if (startswith (name, mips_str_fn_stub)
|| strncmp (name, mips_str_call_stub, strlen (mips_str_call_stub)) == 0) || startswith (name, mips_str_call_stub))
{ {
if (pc == start_addr) if (pc == start_addr)
/* This is the 'call' part of a call stub. Call this helper /* This is the 'call' part of a call stub. Call this helper
@ -7934,7 +7933,7 @@ mips_skip_pic_trampoline_code (struct frame_info *frame, CORE_ADDR pc)
if (msym.minsym == NULL if (msym.minsym == NULL
|| BMSYMBOL_VALUE_ADDRESS (msym) != pc || BMSYMBOL_VALUE_ADDRESS (msym) != pc
|| MSYMBOL_LINKAGE_NAME (msym.minsym) == NULL || MSYMBOL_LINKAGE_NAME (msym.minsym) == NULL
|| strncmp (MSYMBOL_LINKAGE_NAME (msym.minsym), ".pic.", 5) != 0) || !startswith (MSYMBOL_LINKAGE_NAME (msym.minsym), ".pic."))
return 0; return 0;
/* A two-instruction header. */ /* A two-instruction header. */
@ -8099,7 +8098,7 @@ mips_find_abi_section (bfd *abfd, asection *sect, void *obj)
if (*abip != MIPS_ABI_UNKNOWN) if (*abip != MIPS_ABI_UNKNOWN)
return; return;
if (strncmp (name, ".mdebug.", 8) != 0) if (!startswith (name, ".mdebug."))
return; return;
if (strcmp (name, ".mdebug.abi32") == 0) if (strcmp (name, ".mdebug.abi32") == 0)
@ -8124,11 +8123,11 @@ mips_find_long_section (bfd *abfd, asection *sect, void *obj)
int *lbp = (int *) obj; int *lbp = (int *) obj;
const char *name = bfd_get_section_name (abfd, sect); const char *name = bfd_get_section_name (abfd, sect);
if (strncmp (name, ".gcc_compiled_long32", 20) == 0) if (startswith (name, ".gcc_compiled_long32"))
*lbp = 32; *lbp = 32;
else if (strncmp (name, ".gcc_compiled_long64", 20) == 0) else if (startswith (name, ".gcc_compiled_long64"))
*lbp = 64; *lbp = 64;
else if (strncmp (name, ".gcc_compiled_long", 18) == 0) else if (startswith (name, ".gcc_compiled_long"))
warning (_("unrecognized .gcc_compiled_longXX")); warning (_("unrecognized .gcc_compiled_longXX"));
} }

3
gdb/msp430-tdep.c
View file

@ -834,8 +834,7 @@ msp430_in_return_stub (struct gdbarch *gdbarch, CORE_ADDR pc,
const char *name) const char *name)
{ {
return (name != NULL return (name != NULL
&& strncmp (msp430_epilog_name_prefix, name, && startswith (name, msp430_epilog_name_prefix));
strlen (msp430_epilog_name_prefix)) == 0);
} }
/* Implement the "skip_trampoline_code" gdbarch method. */ /* Implement the "skip_trampoline_code" gdbarch method. */

2
gdb/nat/linux-procfs.c
View file

@ -93,7 +93,7 @@ linux_proc_pid_get_state (pid_t pid, char *buffer, size_t buffer_size,
have_state = 0; have_state = 0;
while (fgets (buffer, buffer_size, procfile) != NULL) while (fgets (buffer, buffer_size, procfile) != NULL)
if (strncmp (buffer, "State:", 6) == 0) if (startswith (buffer, "State:"))
{ {
have_state = 1; have_state = 1;
break; break;

2
gdb/nbsd-tdep.c
View file

@ -45,5 +45,5 @@ nbsd_pc_in_sigtramp (CORE_ADDR pc, const char *func_name)
have function names which begin with "__sigtramp". */ have function names which begin with "__sigtramp". */
return (func_name != NULL return (func_name != NULL
&& strncmp (func_name, "__sigtramp", 10) == 0); && startswith (func_name, "__sigtramp"));
} }

10
gdb/p-typeprint.c
View file

@ -154,8 +154,8 @@ void
pascal_type_print_method_args (const char *physname, const char *methodname, pascal_type_print_method_args (const char *physname, const char *methodname,
struct ui_file *stream) struct ui_file *stream)
{ {
int is_constructor = (strncmp (physname, "__ct__", 6) == 0); int is_constructor = (startswith (physname, "__ct__"));
int is_destructor = (strncmp (physname, "__dt__", 6) == 0); int is_destructor = (startswith (physname, "__dt__"));
if (is_constructor || is_destructor) if (is_constructor || is_destructor)
{ {
@ -567,7 +567,7 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show,
{ {
QUIT; QUIT;
/* Don't print out virtual function table. */ /* Don't print out virtual function table. */
if ((strncmp (TYPE_FIELD_NAME (type, i), "_vptr", 5) == 0) if ((startswith (TYPE_FIELD_NAME (type, i), "_vptr"))
&& is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5])) && is_cplus_marker ((TYPE_FIELD_NAME (type, i))[5]))
continue; continue;
@ -643,8 +643,8 @@ pascal_type_print_base (struct type *type, struct ui_file *stream, int show,
{ {
const char *physname = TYPE_FN_FIELD_PHYSNAME (f, j); const char *physname = TYPE_FN_FIELD_PHYSNAME (f, j);
int is_constructor = (strncmp (physname, "__ct__", 6) == 0); int is_constructor = (startswith (physname, "__ct__"));
int is_destructor = (strncmp (physname, "__dt__", 6) == 0); int is_destructor = (startswith (physname, "__dt__"));
QUIT; QUIT;
if (TYPE_FN_FIELD_PROTECTED (f, j)) if (TYPE_FN_FIELD_PROTECTED (f, j))

2
gdb/ppc-linux-tdep.c
View file

@ -985,7 +985,7 @@ ppc_linux_write_pc (struct regcache *regcache, CORE_ADDR pc)
static int static int
ppc_linux_spu_section (bfd *abfd, asection *asect, void *user_data) ppc_linux_spu_section (bfd *abfd, asection *asect, void *user_data)
{ {
return strncmp (bfd_section_name (abfd, asect), "SPU/", 4) == 0; return startswith (bfd_section_name (abfd, asect), "SPU/");
} }
static const struct target_desc * static const struct target_desc *

6
gdb/python/py-type.c
View file

@ -747,11 +747,11 @@ typy_lookup_typename (const char *type_name, const struct block *block)
TRY_CATCH (except, RETURN_MASK_ALL) TRY_CATCH (except, RETURN_MASK_ALL)
{ {
if (!strncmp (type_name, "struct ", 7)) if (startswith (type_name, "struct "))
type = lookup_struct (type_name + 7, NULL); type = lookup_struct (type_name + 7, NULL);
else if (!strncmp (type_name, "union ", 6)) else if (startswith (type_name, "union "))
type = lookup_union (type_name + 6, NULL); type = lookup_union (type_name + 6, NULL);
else if (!strncmp (type_name, "enum ", 5)) else if (startswith (type_name, "enum "))
type = lookup_enum (type_name + 5, NULL); type = lookup_enum (type_name + 5, NULL);
else else
type = lookup_typename (python_language, python_gdbarch, type = lookup_typename (python_language, python_gdbarch,

2
gdb/regcache.c
View file

@ -1342,7 +1342,7 @@ regcache_dump (struct regcache *regcache, struct ui_file *file,
t = n; t = n;
} }
/* Chop a leading builtin_type. */ /* Chop a leading builtin_type. */
if (strncmp (t, blt, strlen (blt)) == 0) if (startswith (t, blt))
t += strlen (blt); t += strlen (blt);
} }
fprintf_unfiltered (file, " %-15s", t); fprintf_unfiltered (file, " %-15s", t);

4
gdb/remote-m32r-sdi.c
View file

@ -1265,9 +1265,9 @@ m32r_load (struct target_ops *self, const char *args, int from_tty)
if (*arg != '-') if (*arg != '-')
filename = arg; filename = arg;
else if (strncmp (arg, "-quiet", strlen (arg)) == 0) else if (startswith ("-quiet", arg))
quiet = 1; quiet = 1;
else if (strncmp (arg, "-nostart", strlen (arg)) == 0) else if (startswith ("-nostart", arg))
nostart = 1; nostart = 1;
else else
error (_("Unknown option `%s'"), arg); error (_("Unknown option `%s'"), arg);

2
gdb/remote-notif.c
View file

@ -133,7 +133,7 @@ handle_notification (struct remote_notif_state *state, char *buf)
{ {
const char *name = notifs[i]->name; const char *name = notifs[i]->name;
if (strncmp (buf, name, strlen (name)) == 0 if (startswith (buf, name)
&& buf[strlen (name)] == ':') && buf[strlen (name)] == ':')
break; break;
} }

25
gdb/remote.c
View file

@ -491,7 +491,7 @@ remote_get_noisy_reply (char **buf_p,
buf = *buf_p; buf = *buf_p;
if (buf[0] == 'E') if (buf[0] == 'E')
trace_error (buf); trace_error (buf);
else if (strncmp (buf, "qRelocInsn:", strlen ("qRelocInsn:")) == 0) else if (startswith (buf, "qRelocInsn:"))
{ {
ULONGEST ul; ULONGEST ul;
CORE_ADDR from, to, org_to; CORE_ADDR from, to, org_to;
@ -3157,14 +3157,14 @@ get_offsets (void)
ptr = buf; ptr = buf;
lose = 0; lose = 0;
if (strncmp (ptr, "Text=", 5) == 0) if (startswith (ptr, "Text="))
{ {
ptr += 5; ptr += 5;
/* Don't use strtol, could lose on big values. */ /* Don't use strtol, could lose on big values. */
while (*ptr && *ptr != ';') while (*ptr && *ptr != ';')
text_addr = (text_addr << 4) + fromhex (*ptr++); text_addr = (text_addr << 4) + fromhex (*ptr++);
if (strncmp (ptr, ";Data=", 6) == 0) if (startswith (ptr, ";Data="))
{ {
ptr += 6; ptr += 6;
while (*ptr && *ptr != ';') while (*ptr && *ptr != ';')
@ -3173,7 +3173,7 @@ get_offsets (void)
else else
lose = 1; lose = 1;
if (!lose && strncmp (ptr, ";Bss=", 5) == 0) if (!lose && startswith (ptr, ";Bss="))
{ {
ptr += 5; ptr += 5;
while (*ptr && *ptr != ';') while (*ptr && *ptr != ';')
@ -3185,7 +3185,7 @@ get_offsets (void)
else else
lose = 1; lose = 1;
} }
else if (strncmp (ptr, "TextSeg=", 8) == 0) else if (startswith (ptr, "TextSeg="))
{ {
ptr += 8; ptr += 8;
/* Don't use strtol, could lose on big values. */ /* Don't use strtol, could lose on big values. */
@ -3193,7 +3193,7 @@ get_offsets (void)
text_addr = (text_addr << 4) + fromhex (*ptr++); text_addr = (text_addr << 4) + fromhex (*ptr++);
num_segments = 1; num_segments = 1;
if (strncmp (ptr, ";DataSeg=", 9) == 0) if (startswith (ptr, ";DataSeg="))
{ {
ptr += 9; ptr += 9;
while (*ptr && *ptr != ';') while (*ptr && *ptr != ';')
@ -3800,7 +3800,7 @@ remote_check_symbols (void)
packet_ok (rs->buf, &remote_protocol_packets[PACKET_qSymbol]); packet_ok (rs->buf, &remote_protocol_packets[PACKET_qSymbol]);
reply = rs->buf; reply = rs->buf;
while (strncmp (reply, "qSymbol:", 8) == 0) while (startswith (reply, "qSymbol:"))
{ {
struct bound_minimal_symbol sym; struct bound_minimal_symbol sym;
@ -3840,7 +3840,7 @@ remote_serial_open (const char *name)
of in ser-tcp.c, because it is the remote protocol assuming that the of in ser-tcp.c, because it is the remote protocol assuming that the
serial connection is reliable and not the serial connection promising serial connection is reliable and not the serial connection promising
to be. */ to be. */
if (!udp_warning && strncmp (name, "udp:", 4) == 0) if (!udp_warning && startswith (name, "udp:"))
{ {
warning (_("The remote protocol may be unreliable over UDP.\n" warning (_("The remote protocol may be unreliable over UDP.\n"
"Some events may be lost, rendering further debugging " "Some events may be lost, rendering further debugging "
@ -4631,7 +4631,7 @@ remote_vcont_probe (struct remote_state *rs)
buf = rs->buf; buf = rs->buf;
/* Make sure that the features we assume are supported. */ /* Make sure that the features we assume are supported. */
if (strncmp (buf, "vCont", 5) == 0) if (startswith (buf, "vCont"))
{ {
char *p = &buf[5]; char *p = &buf[5];
int support_s, support_S, support_c, support_C; int support_s, support_S, support_c, support_C;
@ -5729,8 +5729,7 @@ Packet: '%s'\n"),
if (*p == '\0') if (*p == '\0')
; ;
else if (strncmp (p, else if (startswith (p, "process:"))
"process:", sizeof ("process:") - 1) == 0)
{ {
ULONGEST upid; ULONGEST upid;
@ -10212,9 +10211,7 @@ remote_bfd_iovec_stat (struct bfd *abfd, void *stream, struct stat *sb)
int int
remote_filename_p (const char *filename) remote_filename_p (const char *filename)
{ {
return strncmp (filename, return startswith (filename, REMOTE_SYSROOT_PREFIX);
REMOTE_SYSROOT_PREFIX,
sizeof (REMOTE_SYSROOT_PREFIX) - 1) == 0;
} }
bfd * bfd *

6
gdb/reverse.c
View file

@ -255,9 +255,9 @@ goto_bookmark_command (char *args, int from_tty)
if (args == NULL || args[0] == '\0') if (args == NULL || args[0] == '\0')
error (_("Command requires an argument.")); error (_("Command requires an argument."));
if (strncmp (args, "start", strlen ("start")) == 0 if (startswith (args, "start")
|| strncmp (args, "begin", strlen ("begin")) == 0 || startswith (args, "begin")
|| strncmp (args, "end", strlen ("end")) == 0) || startswith (args, "end"))
{ {
/* Special case. Give target opportunity to handle. */ /* Special case. Give target opportunity to handle. */
target_goto_bookmark ((gdb_byte *) args, from_tty); target_goto_bookmark ((gdb_byte *) args, from_tty);

2
gdb/rs6000-tdep.c
View file

@ -2220,7 +2220,7 @@ static int
rs6000_in_solib_return_trampoline (struct gdbarch *gdbarch, rs6000_in_solib_return_trampoline (struct gdbarch *gdbarch,
CORE_ADDR pc, const char *name) CORE_ADDR pc, const char *name)
{ {
return name && !strncmp (name, "@FIX", 4); return name && startswith (name, "@FIX");
} }
/* Skip code that the user doesn't want to see when stepping: /* Skip code that the user doesn't want to see when stepping:

4
gdb/ser-tcp.c
View file

@ -168,12 +168,12 @@ net_open (struct serial *scb, const char *name)
unsigned int polls = 0; unsigned int polls = 0;
use_udp = 0; use_udp = 0;
if (strncmp (name, "udp:", 4) == 0) if (startswith (name, "udp:"))
{ {
use_udp = 1; use_udp = 1;
name = name + 4; name = name + 4;
} }
else if (strncmp (name, "tcp:", 4) == 0) else if (startswith (name, "tcp:"))
name = name + 4; name = name + 4;
port_str = strchr (name, ':'); port_str = strchr (name, ':');

4
gdb/serial.c
View file

@ -190,9 +190,9 @@ serial_open (const char *name)
if (strcmp (name, "pc") == 0) if (strcmp (name, "pc") == 0)
ops = serial_interface_lookup ("pc"); ops = serial_interface_lookup ("pc");
else if (strncmp (name, "lpt", 3) == 0) else if (startswith (name, "lpt"))
ops = serial_interface_lookup ("parallel"); ops = serial_interface_lookup ("parallel");
else if (strncmp (name, "|", 1) == 0) else if (startswith (name, "|"))
{ {
ops = serial_interface_lookup ("pipe"); ops = serial_interface_lookup ("pipe");
/* Discard ``|'' and any space before the command itself. */ /* Discard ``|'' and any space before the command itself. */

4
gdb/somread.c
View file

@ -212,8 +212,8 @@ som_symtab_read (bfd *abfd, struct objfile *objfile,
if ((symname[0] == 'L' && symname[1] == '$') if ((symname[0] == 'L' && symname[1] == '$')
|| (symname[0] == '$' && symname[strlen (symname) - 1] == '$') || (symname[0] == '$' && symname[strlen (symname) - 1] == '$')
|| (symname[0] == 'D' && symname[1] == '$') || (symname[0] == 'D' && symname[1] == '$')
|| (strncmp (symname, "L0\001", 3) == 0) || (startswith (symname, "L0\001"))
|| (strncmp (symname, "$PIC", 4) == 0)) || (startswith (symname, "$PIC")))
continue; continue;
break; break;

2
gdb/sparc64nbsd-tdep.c
View file

@ -216,7 +216,7 @@ sparc64nbsd_sigtramp_frame_sniffer (const struct frame_unwind *self,
find_pc_partial_function (pc, &name, NULL, NULL); find_pc_partial_function (pc, &name, NULL, NULL);
if (sparc64nbsd_pc_in_sigtramp (pc, name)) if (sparc64nbsd_pc_in_sigtramp (pc, name))
{ {
if (name == NULL || strncmp (name, "__sigtramp_sigcontext", 21)) if (name == NULL || !startswith (name, "__sigtramp_sigcontext"))
return 1; return 1;
} }

2
gdb/sparcnbsd-tdep.c
View file

@ -241,7 +241,7 @@ sparc32nbsd_sigcontext_frame_sniffer (const struct frame_unwind *self,
find_pc_partial_function (pc, &name, NULL, NULL); find_pc_partial_function (pc, &name, NULL, NULL);
if (sparc32nbsd_pc_in_sigtramp (pc, name)) if (sparc32nbsd_pc_in_sigtramp (pc, name))
{ {
if (name == NULL || strncmp (name, "__sigtramp_sigcontext", 21)) if (name == NULL || !startswith (name, "__sigtramp_sigcontext"))
return 1; return 1;
} }

6
gdb/symtab.c
View file

@ -535,7 +535,7 @@ gdb_mangle_name (struct type *type, int method_id, int signature_id)
|| (newname && strcmp (field_name, newname) == 0); || (newname && strcmp (field_name, newname) == 0);
if (!is_destructor) if (!is_destructor)
is_destructor = (strncmp (physname, "__dt", 4) == 0); is_destructor = (startswith (physname, "__dt"));
if (is_destructor || is_full_physname_constructor) if (is_destructor || is_full_physname_constructor)
{ {
@ -3950,7 +3950,7 @@ static const char *
operator_chars (const char *p, const char **end) operator_chars (const char *p, const char **end)
{ {
*end = ""; *end = "";
if (strncmp (p, "operator", 8)) if (!startswith (p, "operator"))
return *end; return *end;
p += 8; p += 8;
@ -6003,7 +6003,7 @@ producer_is_realview (const char *producer)
return 0; return 0;
for (i = 0; i < ARRAY_SIZE (arm_idents); i++) for (i = 0; i < ARRAY_SIZE (arm_idents); i++)
if (strncmp (producer, arm_idents[i], strlen (arm_idents[i])) == 0) if (startswith (producer, arm_idents[i]))
return 1; return 1;
return 0; return 0;

10
gdb/tracefile-tfile.c
View file

@ -426,7 +426,7 @@ tfile_open (const char *arg, int from_tty)
bytes += TRACE_HEADER_SIZE; bytes += TRACE_HEADER_SIZE;
if (!(header[0] == 0x7f if (!(header[0] == 0x7f
&& (strncmp (header + 1, "TRACE0\n", 7) == 0))) && (startswith (header + 1, "TRACE0\n"))))
error (_("File is not a valid trace file.")); error (_("File is not a valid trace file."));
push_target (&tfile_ops); push_target (&tfile_ops);
@ -510,22 +510,22 @@ tfile_interp_line (char *line, struct uploaded_tp **utpp,
{ {
char *p = line; char *p = line;
if (strncmp (p, "R ", strlen ("R ")) == 0) if (startswith (p, "R "))
{ {
p += strlen ("R "); p += strlen ("R ");
trace_regblock_size = strtol (p, &p, 16); trace_regblock_size = strtol (p, &p, 16);
} }
else if (strncmp (p, "status ", strlen ("status ")) == 0) else if (startswith (p, "status "))
{ {
p += strlen ("status "); p += strlen ("status ");
parse_trace_status (p, current_trace_status ()); parse_trace_status (p, current_trace_status ());
} }
else if (strncmp (p, "tp ", strlen ("tp ")) == 0) else if (startswith (p, "tp "))
{ {
p += strlen ("tp "); p += strlen ("tp ");
parse_tracepoint_definition (p, utpp); parse_tracepoint_definition (p, utpp);
} }
else if (strncmp (p, "tsv ", strlen ("tsv ")) == 0) else if (startswith (p, "tsv "))
{ {
p += strlen ("tsv "); p += strlen ("tsv ");
parse_tsv_definition (p, utsvp); parse_tsv_definition (p, utsvp);

6
gdb/tracepoint.c
View file

@ -3830,11 +3830,11 @@ parse_tracepoint_definition (char *line, struct uploaded_tp **utpp)
end = hex2bin (p, (gdb_byte *) buf, strlen (p) / 2); end = hex2bin (p, (gdb_byte *) buf, strlen (p) / 2);
buf[end] = '\0'; buf[end] = '\0';
if (strncmp (srctype, "at:", strlen ("at:")) == 0) if (startswith (srctype, "at:"))
utp->at_string = xstrdup (buf); utp->at_string = xstrdup (buf);
else if (strncmp (srctype, "cond:", strlen ("cond:")) == 0) else if (startswith (srctype, "cond:"))
utp->cond_string = xstrdup (buf); utp->cond_string = xstrdup (buf);
else if (strncmp (srctype, "cmd:", strlen ("cmd:")) == 0) else if (startswith (srctype, "cmd:"))
VEC_safe_push (char_ptr, utp->cmd_strings, xstrdup (buf)); VEC_safe_push (char_ptr, utp->cmd_strings, xstrdup (buf));
} }
else if (piece == 'V') else if (piece == 'V')

2
gdb/tui/tui-data.c
View file

@ -391,7 +391,7 @@ tui_partial_win_by_name (char *name)
char *cur_name = tui_win_name (&tui_win_list[i]->generic); char *cur_name = tui_win_name (&tui_win_list[i]->generic);
if (strlen (name) <= strlen (cur_name) if (strlen (name) <= strlen (cur_name)
&& strncmp (name, cur_name, strlen (name)) == 0) && startswith (cur_name, name))
win_info = tui_win_list[i]; win_info = tui_win_list[i];
} }
i++; i++;

5
gdb/utils.c
View file

@ -2663,8 +2663,7 @@ subset_compare (char *string_to_compare, char *template_string)
if (template_string != (char *) NULL && string_to_compare != (char *) NULL if (template_string != (char *) NULL && string_to_compare != (char *) NULL
&& strlen (string_to_compare) <= strlen (template_string)) && strlen (string_to_compare) <= strlen (template_string))
match = match =
(strncmp (startswith (template_string, string_to_compare));
(template_string, string_to_compare, strlen (string_to_compare)) == 0);
else else
match = 0; match = 0;
return match; return match;
@ -3278,7 +3277,7 @@ producer_is_gcc (const char *producer, int *major, int *minor)
{ {
const char *cs; const char *cs;
if (producer != NULL && strncmp (producer, "GNU ", strlen ("GNU ")) == 0) if (producer != NULL && startswith (producer, "GNU "))
{ {
int maj, min; int maj, min;

12
gdb/valops.c
View file

@ -1992,9 +1992,9 @@ search_struct_method (const char *name, struct value **arg1p,
const char *t_field_name = TYPE_FN_FIELDLIST_NAME (type, i); const char *t_field_name = TYPE_FN_FIELDLIST_NAME (type, i);
/* FIXME! May need to check for ARM demangling here. */ /* FIXME! May need to check for ARM demangling here. */
if (strncmp (t_field_name, "__", 2) == 0 || if (startswith (t_field_name, "__") ||
strncmp (t_field_name, "op", 2) == 0 || startswith (t_field_name, "op") ||
strncmp (t_field_name, "type", 4) == 0) startswith (t_field_name, "type"))
{ {
if (cplus_demangle_opname (t_field_name, dem_opname, DMGL_ANSI)) if (cplus_demangle_opname (t_field_name, dem_opname, DMGL_ANSI))
t_field_name = dem_opname; t_field_name = dem_opname;
@ -3386,9 +3386,9 @@ value_struct_elt_for_reference (struct type *domain, int offset,
const char *t_field_name = TYPE_FN_FIELDLIST_NAME (t, i); const char *t_field_name = TYPE_FN_FIELDLIST_NAME (t, i);
char dem_opname[64]; char dem_opname[64];
if (strncmp (t_field_name, "__", 2) == 0 if (startswith (t_field_name, "__")
|| strncmp (t_field_name, "op", 2) == 0 || startswith (t_field_name, "op")
|| strncmp (t_field_name, "type", 4) == 0) || startswith (t_field_name, "type"))
{ {
if (cplus_demangle_opname (t_field_name, if (cplus_demangle_opname (t_field_name,
dem_opname, DMGL_ANSI)) dem_opname, DMGL_ANSI))

8
gdb/windows-nat.c
View file

@ -813,11 +813,10 @@ handle_output_debug_string (struct target_waitstatus *ourstatus)
&s, 1024, 0) &s, 1024, 0)
|| !s || !*s) || !s || !*s)
/* nothing to do */; /* nothing to do */;
else if (strncmp (s, _CYGWIN_SIGNAL_STRING, else if (!startswith (s, _CYGWIN_SIGNAL_STRING))
sizeof (_CYGWIN_SIGNAL_STRING) - 1) != 0)
{ {
#ifdef __CYGWIN__ #ifdef __CYGWIN__
if (strncmp (s, "cYg", 3) != 0) if (!startswith (s, "cYg"))
#endif #endif
warning (("%s"), s); warning (("%s"), s);
} }
@ -1014,8 +1013,7 @@ handle_exception (struct target_waitstatus *ourstatus)
if ((!cygwin_exceptions && (addr >= cygwin_load_start if ((!cygwin_exceptions && (addr >= cygwin_load_start
&& addr < cygwin_load_end)) && addr < cygwin_load_end))
|| (find_pc_partial_function (addr, &fn, NULL, NULL) || (find_pc_partial_function (addr, &fn, NULL, NULL)
&& strncmp (fn, "KERNEL32!IsBad", && startswith (fn, "KERNEL32!IsBad")))
strlen ("KERNEL32!IsBad")) == 0))
return 0; return 0;
} }
#endif #endif

2
gdb/xcoffread.c
View file

@ -2839,7 +2839,7 @@ scan_xcoff_symtab (struct objfile *objfile)
loader-generated definitions. Keeping the global loader-generated definitions. Keeping the global
symbols leads to "in psymbols but not in symbols" symbols leads to "in psymbols but not in symbols"
errors. */ errors. */
if (strncmp (namestring, "@FIX", 4) == 0) if (startswith (namestring, "@FIX"))
continue; continue;
symbol.n_value += ANOFFSET (objfile->section_offsets, symbol.n_value += ANOFFSET (objfile->section_offsets,