From: Trevor Saunders Date: Sat, 2 Apr 2016 13:27:18 +0000 (-0400) Subject: use xstrdup and friends more X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=a44e2901c749445d16ba1e3875b50af9c4bbb3c5;hp=ae2689b09ff821b285159db064705068bb4cfa02;p=deliverable%2Fbinutils-gdb.git use xstrdup and friends more gas/ChangeLog: 2016-04-03 Trevor Saunders * config/obj-elf.c (obj_elf_vendor_attribute): Use xstrdup. * config/tc-ppc.c (ppc_frob_file_before_adjust): Likewise. (ppc_znop): Likewise. (ppc_pe_section): Likewise. (ppc_frob_symbol): Likewise. * config/tc-tic30.c (tic30_operand): Likewise. * config/tc-tic4x.c (tic4x_sect): Likewise. (tic4x_usect): Likewise. --- diff --git a/gas/ChangeLog b/gas/ChangeLog index 4c9ab5281d..a85506e39b 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,14 @@ +2016-04-03 Trevor Saunders + + * config/obj-elf.c (obj_elf_vendor_attribute): Use xstrdup. + * config/tc-ppc.c (ppc_frob_file_before_adjust): Likewise. + (ppc_znop): Likewise. + (ppc_pe_section): Likewise. + (ppc_frob_symbol): Likewise. + * config/tc-tic30.c (tic30_operand): Likewise. + * config/tc-tic4x.c (tic4x_sect): Likewise. + (tic4x_usect): Likewise. + 2016-04-03 Trevor Saunders * config/tc-alpha.c: Const qualify FLT_CHARS. diff --git a/gas/config/obj-elf.c b/gas/config/obj-elf.c index 1d07d4b7d6..68290e21ce 100644 --- a/gas/config/obj-elf.c +++ b/gas/config/obj-elf.c @@ -1609,9 +1609,7 @@ obj_elf_vendor_attribute (int vendor) if (i == 0) goto bad; - name = xmalloc (i + 1); - memcpy (name, s, i); - name[i] = '\0'; + name = xstrndup (s, i); #ifndef CONVERT_SYMBOLIC_ATTRIBUTE #define CONVERT_SYMBOLIC_ATTRIBUTE(a) -1 diff --git a/gas/config/tc-ppc.c b/gas/config/tc-ppc.c index cf4f96e764..23a84a78f6 100644 --- a/gas/config/tc-ppc.c +++ b/gas/config/tc-ppc.c @@ -2390,7 +2390,6 @@ ppc_frob_file_before_adjust (void) const char *name; char *dotname; symbolS *dotsym; - size_t len; name = S_GET_NAME (symp); if (name[0] == '.') @@ -2400,10 +2399,7 @@ ppc_frob_file_before_adjust (void) || S_IS_DEFINED (symp)) continue; - len = strlen (name) + 1; - dotname = xmalloc (len + 1); - dotname[0] = '.'; - memcpy (dotname + 1, name, len); + dotname = concat (".", name, (char *) NULL); dotsym = symbol_find_noref (dotname, 1); free (dotname); if (dotsym != NULL && (symbol_used_p (dotsym) @@ -5195,8 +5191,7 @@ ppc_znop (int ignore ATTRIBUTE_UNUSED) /* Strip out the symbol name. */ c = get_symbol_name (&symbol_name); - name = xmalloc (input_line_pointer - symbol_name + 1); - strcpy (name, symbol_name); + name = xstrdup (symbol_name); sym = symbol_find_or_make (name); @@ -5370,8 +5365,7 @@ ppc_pe_section (int ignore ATTRIBUTE_UNUSED) c = get_symbol_name (§ion_name); - name = xmalloc (input_line_pointer - section_name + 1); - strcpy (name, section_name); + name = xstrdup (section_name); *input_line_pointer = c; @@ -5768,9 +5762,7 @@ ppc_frob_symbol (symbolS *sym) char *snew; len = s - name; - snew = xmalloc (len + 1); - memcpy (snew, name, len); - snew[len] = '\0'; + snew = xstrndup (name, len); S_SET_NAME (sym, snew); } diff --git a/gas/config/tc-tic30.c b/gas/config/tc-tic30.c index 71c6249422..10653ed2e8 100644 --- a/gas/config/tc-tic30.c +++ b/gas/config/tc-tic30.c @@ -604,9 +604,7 @@ tic30_operand (char *token) segT retval; debug ("Probably a label: %s\n", token); - current_op->immediate.label = malloc (strlen (token) + 1); - strcpy (current_op->immediate.label, token); - current_op->immediate.label[strlen (token)] = '\0'; + current_op->immediate.label = xstrdup (token); save_input_line_pointer = input_line_pointer; input_line_pointer = token; @@ -634,9 +632,7 @@ tic30_operand (char *token) for (count = 0; count < strlen (token); count++) if (*(token + count) == '.') current_op->immediate.decimal_found = 1; - current_op->immediate.label = malloc (strlen (token) + 1); - strcpy (current_op->immediate.label, token); - current_op->immediate.label[strlen (token)] = '\0'; + current_op->immediate.label = xstrdup (token); current_op->immediate.f_number = (float) atof (token); current_op->immediate.s_number = (int) atoi (token); current_op->immediate.u_number = (unsigned int) atoi (token); diff --git a/gas/config/tc-tic4x.c b/gas/config/tc-tic4x.c index c44201d004..ba0aa38a34 100644 --- a/gas/config/tc-tic4x.c +++ b/gas/config/tc-tic4x.c @@ -964,8 +964,7 @@ tic4x_sect (int x ATTRIBUTE_UNUSED) if (c == '"') c = * ++ input_line_pointer; input_line_pointer++; /* Skip null symbol terminator. */ - name = xmalloc (input_line_pointer - section_name + 1); - strcpy (name, section_name); + name = xstrdup (section_name); /* TI C from version 5.0 allows a section name to contain a subsection name as well. The subsection name is separated by a @@ -1075,8 +1074,7 @@ tic4x_usect (int x ATTRIBUTE_UNUSED) if (c == '"') c = * ++ input_line_pointer; input_line_pointer++; /* Skip null symbol terminator. */ - name = xmalloc (input_line_pointer - section_name + 1); - strcpy (name, section_name); + name = xstrdup (section_name); if (c == ',') input_line_pointer =