Add include files to get prototype declarations, and fix bugs found.

[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 65b1d09..69417db 100644 (file)
--- a/usr/src/lib/libc/string/swab.c
+++ b/usr/src/lib/libc/string/swab.c
@@ -2,36 +2,31 @@
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
  *

- * 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.
+ * This code is derived from software contributed to Berkeley by
+ * Jeffrey Mogul.
+ *
+ * %sccs.include.redist.c%

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

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

 #endif /* LIBC_SCCS and not lint */
 
 #endif /* LIBC_SCCS and not lint */
 

-/*
- * Swab bytes
- * Jeffrey Mogul, Stanford
- */
+#include <string.h>

 
 

+void

 swab(from, to, n)
 swab(from, to, n)

-       register char *from, *to;
-       register int n;
+       const void *from;
+       void *to;
+       register size_t n;

 {
 {

+       register char *fp, *tp;

        register unsigned long temp;
 
        n >>= 1; n++;
        register unsigned long temp;
 
        n >>= 1; n++;

-#define        STEP    temp = *from++,*to++ = *from++,*to++ = temp
+       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;