1 files changed, 16 insertions, 21 deletions

diff --git a/src/lib/libc/string/swab.c b/src/lib/libc/string/swab.c
index f33fc53bd6..b74db7e62a 100644
--- a/src/lib/libc/string/swab.c
+++ b/src/lib/libc/string/swab.c
@@ -1,3 +1,4 @@
+/*      $OpenBSD: swab.c,v 1.8 2008/03/15 21:54:09 ray Exp $ */
 /*
  * Copyright (c) 1988 Regents of the University of California.
  * All rights reserved.
@@ -13,11 +14,7 @@
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *      This product includes software developed by the University of
- *      California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -34,32 +31,30 @@
  * SUCH DAMAGE.
  */
 
-#if defined(LIBC_SCCS) && !defined(lint)
-/*static char *sccsid = "from: @(#)swab.c       5.10 (Berkeley) 3/6/91";*/
-static char *rcsid = "$Id: swab.c,v 1.1.1.1 1995/10/18 08:42:23 deraadt Exp $";
-#endif /* LIBC_SCCS and not lint */
-
-#include <string.h>
+#include <unistd.h>
 
 void
-swab(from, to, len)
-        const void *from;
-        void *to;
-        size_t len;
+swab(const void *from, void *to, size_t len)
 {
-        register unsigned long temp;
-        register int n;
-        register char *fp, *tp;
+        size_t n;
+        char *fp, *tp;
+        char temp;
 
-        n = (len >> 1) + 1;
+        n = (len / 2) + 1;
         fp = (char *)from;
         tp = (char *)to;
-#define STEP    temp = *fp++,*tp++ = *fp++,*tp++ = temp
+#define STEP do {       \
+        temp = *fp++;   \
+        *tp++ = *fp++;  \
+        *tp++ = temp;   \
+} while (0)
         /* round to multiple of 8 */
         while ((--n) & 07)
                 STEP;
         n >>= 3;
-        while (--n >= 0) {
+        if (n == 0)
+                return;
+        while (n-- != 0) {
                 STEP; STEP; STEP; STEP;
                 STEP; STEP; STEP; STEP;
         }