my previous version was wrong; this one is right

[unix-history] / usr / src / lib / libc / string / swab.c

diff --git a/usr/src/lib/libc/string/swab.c b/usr/src/lib/libc/string/swab.c
index 1a4f15d..6f9c243 100644 (file)
--- a/usr/src/lib/libc/string/swab.c
+++ b/usr/src/lib/libc/string/swab.c
@@ -5,34 +5,29 @@
  * This code is derived from software contributed to Berkeley by
  * Jeffrey Mogul.
  *
  * This code is derived from software contributed to Berkeley by
  * Jeffrey Mogul.
  *

- * Redistribution and use in source and binary forms are permitted
- * provided that the above copyright notice and this paragraph are
- * duplicated in all such forms and that any documentation,
- * advertising materials, and other materials related to such
- * distribution and use acknowledge that the software was developed
- * by the University of California, Berkeley.  The name of the
- * University may not be used to endorse or promote products derived
- * from this software without specific prior written permission.
- * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
- * WARRANTIES OF MERCHANTIBILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+ * %sccs.include.redist.c%

  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)swab.c     5.5 (Berkeley) %G%";
+static char sccsid[] = "@(#)swab.c     5.10 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <string.h>
 
 void
 #endif /* LIBC_SCCS and not lint */
 
 #include <string.h>
 
 void

-swab(from, to, n)
-       register char *from, *to;
-       register int n;
+swab(from, to, len)
+       const void *from;
+       void *to;
+       size_t len;

 {
        register unsigned long temp;
 {
        register unsigned long temp;

+       register int n;
+       register char *fp, *tp;

 
 

-       n >>= 1; n++;
-#define        STEP    temp = *from++,*to++ = *from++,*to++ = temp
+       n = (len >> 1) + 1;
+       fp = (char *)from;
+       tp = (char *)to;
+#define        STEP    temp = *fp++,*tp++ = *fp++,*tp++ = temp

        /* round to multiple of 8 */
        while ((--n) & 07)
                STEP;
        /* round to multiple of 8 */
        while ((--n) & 07)
                STEP;