bfd/

	* oasys.c (oasys_write_header): Fix compilation warning on zero-sized
	memset.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 1f8f30e6215c5fc89df16d09017ac813eac0711e..f2e40dda0f14f87069d8285458872fdbe7ed8f7d 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2012-02-11  Jan Kratochvil  <jan.kratochvil@redhat.com>
+           Nick Clifton  <nickc@redhat.com>
+
+       * oasys.c (oasys_write_header): Fix compilation warning on zero-sized
+       memset.
+
 2012-02-10  Iain Sandoe  <idsandoe@googlemail.com>
 
        * mach-o.c (bfd_mach_o_build_seg_command): Count zerofill section

diff --git a/bfd/oasys.c b/bfd/oasys.c
index 11d24401fe188b2874dd25298d47865887c0521a..ebb12e844e24ca5a7ffa0c35f7370ebf7385855f 100644 (file)
--- a/bfd/oasys.c
+++ b/bfd/oasys.c
@@ -906,9 +906,11 @@ oasys_write_header (bfd *abfd)
 
   if (length > (size_t) sizeof (r.module_name))
     length = sizeof (r.module_name);
+  else if (length < (size_t) sizeof (r.module_name))
+    (void) memset (r.module_name + length, ' ',
+                  sizeof (r.module_name) - length);
 
   (void) memcpy (r.module_name, abfd->filename, length);
-  (void) memset (r.module_name + length, ' ', sizeof (r.module_name) - length);
 
   r.version_number = OASYS_VERSION_NUMBER;
   r.rev_number = OASYS_REV_NUMBER;