BSD 4_3_Reno release

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

diff --git a/usr/src/lib/libc/string/memset.c b/usr/src/lib/libc/string/memset.c
index 331d755..e558559 100644 (file)
--- a/usr/src/lib/libc/string/memset.c
+++ b/usr/src/lib/libc/string/memset.c
@@ -1,26 +1,45 @@
-/*
- * Copyright (c) 1985 Regents of the University of California.
- * All rights reserved.  The Berkeley software License Agreement
- * specifies the terms and conditions for redistribution.
+/*-
+ * Copyright (c) 1990 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Chris Torek.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that: (1) source distributions retain this entire copyright
+ * notice and comment, and (2) distributions including binaries display
+ * the following acknowledgement:  ``This product includes software
+ * developed by the University of California, Berkeley and its contributors''
+ * in the documentation or other materials provided with the distribution
+ * and in all advertising materials mentioning features or use of this
+ * software. 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.
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND WITHOUT ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.

  */
 
  */
 

-/*
- * Sys5 compat routine
- */
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)memset.c   5.5 (Berkeley) 5/15/90";
+#endif /* LIBC_SCCS and not lint */

 
 

-#ifndef lint
-static char sccsid[] = "@(#)memset.c   5.1 (Berkeley) 85/08/05";
-#endif
+#include <string.h>
+#include <sys/stdc.h>

 
 

-char *
-memset(s, c, n)
-       register char *s;
-       register c, n;
+void *
+memset(dst, c, n)
+       void *dst;
+       register int c;
+       register size_t n;

 {
 {

-       register char *p = s;

 
 

-       while (--n >= 0)
-               *s++ = c;
+       if (n != 0) {
+               register char *d = dst;

 
 

-       return (p);
+               do
+                       *d++ = c;
+               while (--n != 0);
+       }
+       return (dst);

 }
 }