Tidy string_ptr increment

Message ID ZB187ZhUAam/KJLp@squeak.grove.modra.org
State Repeat Merge
Headers
Series Tidy string_ptr increment |

Checks

Context Check Description
snail/binutils-gdb-check warning Git am fail log

Commit Message

Alan Modra March 24, 2023, 10:35 a.m. UTC
  I was going to make this
  vars->string_ptr += strlen (vars->string_ptr) + 1;
but figured we ought to be able to trust sprintf return value
nowadays.

	* peicode.h (pe_ILF_make_a_symbol): Use sprintf output to
	increment string_ptr to end of new string.
  

Patch

diff --git a/bfd/peicode.h b/bfd/peicode.h
index f1f3ce81533..f16aeca7a1b 100644
--- a/bfd/peicode.h
+++ b/bfd/peicode.h
@@ -576,7 +576,7 @@  pe_ILF_make_a_symbol (pe_ILF_vars *  vars,
   esym = vars->esym_ptr;
 
   /* Copy the symbol's name into the string table.  */
-  sprintf (vars->string_ptr, "%s%s", prefix, symbol_name);
+  int len = sprintf (vars->string_ptr, "%s%s", prefix, symbol_name);
 
   if (section == NULL)
     section = bfd_und_section_ptr;
@@ -612,7 +612,7 @@  pe_ILF_make_a_symbol (pe_ILF_vars *  vars,
   vars->table_ptr ++;
   vars->native_ptr ++;
   vars->esym_ptr ++;
-  vars->string_ptr += strlen (symbol_name) + strlen (prefix) + 1;
+  vars->string_ptr += len + 1;
 
   BFD_ASSERT (vars->string_ptr < vars->end_string_ptr);
 }