Memset arguments switched

Martin J. Laubach mjl@netbsd.org
Tue Jul 23 05:11:00 GMT 2002


  Some arguments to memset() are obviously switched (probably
left overs from bset() days). Here is a patch that corrects
that. Note that it's against the current NetBSD source tree.

	mjl



Index: gnusrc/gnu/dist/toolchain/bfd/peXXigen.c
diff -u gnusrc/gnu/dist/toolchain/bfd/peXXigen.c:1.1.1.1 gnusrc/gnu/dist/toolchain/bfd/peXXigen.c:1.2
--- gnusrc/gnu/dist/toolchain/bfd/peXXigen.c:1.1.1.1	Tue Aug 14 05:50:35 2001
+++ gnusrc/gnu/dist/toolchain/bfd/peXXigen.c	Wed Jul 17 02:07:33 2002
@@ -639,7 +639,7 @@
   extra->NumberOfRvaAndSizes = IMAGE_NUMBEROF_DIRECTORY_ENTRIES;
 
   /* first null out all data directory entries ..  */
-  memset (extra->DataDirectory, sizeof (extra->DataDirectory), 0);
+  memset (extra->DataDirectory, 0, sizeof (extra->DataDirectory));
 
   add_data_entry (abfd, extra, 0, ".edata", ib);
 
Index: gnusrc/gnu/dist/toolchain/gas/config/tc-z8k.c
diff -u gnusrc/gnu/dist/toolchain/gas/config/tc-z8k.c:1.1.1.3 gnusrc/gnu/dist/toolchain/gas/config/tc-z8k.c:1.2
--- gnusrc/gnu/dist/toolchain/gas/config/tc-z8k.c:1.1.1.3	Tue Aug 14 05:52:18 2001
+++ gnusrc/gnu/dist/toolchain/gas/config/tc-z8k.c	Wed Jul 17 02:08:04 2002
@@ -996,7 +996,7 @@
   frag_wane (frag_now);
   frag_new (0);
 
-  memset (buffer, 20, 0);
+  memset (buffer, 0, 20);
   class_ptr = this_try->byte_info;
 
   for (nibble = 0; (c = *class_ptr++); nibble++)
Index: gnusrc/gnu/dist/gas/config/tc-z8k.c
diff -u gnusrc/gnu/dist/gas/config/tc-z8k.c:1.1.1.1 gnusrc/gnu/dist/gas/config/tc-z8k.c:1.2
--- gnusrc/gnu/dist/gas/config/tc-z8k.c:1.1.1.1	Wed Sep 24 18:41:05 1997
+++ gnusrc/gnu/dist/gas/config/tc-z8k.c	Sat Jul 20 19:51:43 2002
@@ -1027,7 +1027,7 @@
   frag_wane (frag_now);
   frag_new (0);
 
-  memset (buffer, 20, 0);
+  memset (buffer, 0, 20);
   class_ptr = this_try->byte_info;
 top:;
 
Index: gnusrc/gnu/dist/toolchain/gdb/ser-pipe.c
diff -u gnusrc/gnu/dist/toolchain/gdb/ser-pipe.c:1.1.1.1 gnusrc/gnu/dist/toolchain/gdb/ser-pipe.c:1.2
--- gnusrc/gnu/dist/toolchain/gdb/ser-pipe.c:1.1.1.1	Wed Jul 26 03:32:59 2000
+++ gnusrc/gnu/dist/toolchain/gdb/ser-pipe.c	Sat Jul 20 19:51:44 2002
@@ -133,7 +133,7 @@
 _initialize_ser_pipe (void)
 {
   struct serial_ops *ops = XMALLOC (struct serial_ops);
-  memset (ops, sizeof (struct serial_ops), 0);
+  memset (ops, 0, sizeof (struct serial_ops));
   ops->name = "pipe";
   ops->next = 0;
   ops->open = pipe_open;
Index: gnusrc/gnu/dist/toolchain/gdb/ser-tcp.c
diff -u gnusrc/gnu/dist/toolchain/gdb/ser-tcp.c:1.1.1.1 gnusrc/gnu/dist/toolchain/gdb/ser-tcp.c:1.2
--- gnusrc/gnu/dist/toolchain/gdb/ser-tcp.c:1.1.1.1	Wed Jul 26 03:32:59 2000
+++ gnusrc/gnu/dist/toolchain/gdb/ser-tcp.c	Sat Jul 20 19:51:44 2002
@@ -136,7 +136,7 @@
 _initialize_ser_tcp (void)
 {
   struct serial_ops *ops = XMALLOC (struct serial_ops);
-  memset (ops, sizeof (struct serial_ops), 0);
+  memset (ops, 0, sizeof (struct serial_ops));
   ops->name = "tcp";
   ops->next = 0;
   ops->open = tcp_open;
Index: gnusrc/gnu/dist/toolchain/gdb/ser-unix.c
diff -u gnusrc/gnu/dist/toolchain/gdb/ser-unix.c:1.1.1.1 gnusrc/gnu/dist/toolchain/gdb/ser-unix.c:1.2
--- gnusrc/gnu/dist/toolchain/gdb/ser-unix.c:1.1.1.1	Wed Jul 26 03:32:59 2000
+++ gnusrc/gnu/dist/toolchain/gdb/ser-unix.c	Sat Jul 20 19:51:44 2002
@@ -1284,7 +1284,7 @@
 _initialize_ser_hardwire (void)
 {
   struct serial_ops *ops = XMALLOC (struct serial_ops);
-  memset (ops, sizeof (struct serial_ops), 0);
+  memset (ops, 0, sizeof (struct serial_ops));
   ops->name = "hardwire";
   ops->next = 0;
   ops->open = hardwire_open;
Index: gnusrc/gnu/dist/toolchain/sim/ppc/hw_nvram.c
diff -u gnusrc/gnu/dist/toolchain/sim/ppc/hw_nvram.c:1.1.1.1 gnusrc/gnu/dist/toolchain/sim/ppc/hw_nvram.c:1.2
--- gnusrc/gnu/dist/toolchain/sim/ppc/hw_nvram.c:1.1.1.1	Wed Jul 26 03:35:03 2000
+++ gnusrc/gnu/dist/toolchain/sim/ppc/hw_nvram.c	Sat Jul 20 19:51:44 2002
@@ -140,7 +140,7 @@
     nvram->memory = zalloc(nvram->sizeof_memory);
   }
   else
-    memset(nvram->memory, nvram->sizeof_memory, 0);
+    memset(nvram->memory, 0, nvram->sizeof_memory);
   
   if (device_find_property(me, "timezone") == NULL)
     nvram->timezone = 0;
Index: gnusrc/gnu/usr.bin/gas/subsegs.c
diff -u gnusrc/gnu/usr.bin/gas/subsegs.c:1.4 gnusrc/gnu/usr.bin/gas/subsegs.c:1.5
--- gnusrc/gnu/usr.bin/gas/subsegs.c:1.4	Tue Mar 21 17:27:12 1995
+++ gnusrc/gnu/usr.bin/gas/subsegs.c	Sat Jul 20 19:51:44 2002
@@ -97,7 +97,7 @@
 	/* It won't be used=> is ok if obstack... */
 	/* pads the end of it for alignment. */
 	frag_now=(fragS *)obstack_alloc(&frags,SIZEOF_STRUCT_FRAG);
-	memset(frag_now,  SIZEOF_STRUCT_FRAG, 0); 
+	memset(frag_now, 0, SIZEOF_STRUCT_FRAG); 
 	/* This 1st frag will not be in any frchain. */
 	/* We simply give subseg_new somewhere to scribble. */
 	now_subseg = 42;		/* Lie for 1st call to subseg_new. */
@@ -254,7 +254,7 @@
 				 * This should be the only code that creates a frchainS.
 				 */
 				newP=(frchainS *)obstack_alloc(&frags,sizeof(frchainS));
-				memset(newP, sizeof(frchainS), 0); 
+				memset(newP, 0, sizeof(frchainS)); 
 				/* This begines on a good boundary */
 				/* because a obstack_done() preceeded  it. */
 				/* It implies an obstack_done(), so we */



More information about the Gcc-patches mailing list