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 2a15431..69417db 100644 (file)
--- a/usr/src/lib/libc/string/swab.c
+++ b/usr/src/lib/libc/string/swab.c
@@ -1,18 +1,32 @@
-/*     swab.c  4.2     83/06/27        */
-

 /*
 /*

- * Swab bytes
- * Jeffrey Mogul, Stanford
+ * Copyright (c) 1988 Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Jeffrey Mogul.
+ *
+ * %sccs.include.redist.c%

  */
 
  */
 

+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)swab.c     5.9 (Berkeley) %G%";
+#endif /* LIBC_SCCS and not lint */
+
+#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;
        register unsigned long temp;

-       
+

        n >>= 1; n++;
        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;