Release 4.1

[unix-history] / usr / src / usr.bin / tn3270 / general / general.h

diff --git a/usr/src/usr.bin/tn3270/general/general.h b/usr/src/usr.bin/tn3270/general/general.h
index 7eff215..88fb7b5 100644 (file)
--- a/usr/src/usr.bin/tn3270/general/general.h
+++ b/usr/src/usr.bin/tn3270/general/general.h
@@ -1,7 +1,25 @@
 /*
 /*

- * Some general definitions.
+ * 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.
+ *
+ *     @(#)general.h   4.1 (Berkeley) %G%

  */
 
  */
 

+/*
+ * Some general definitions.
+ */

 
 #define        numberof(x)     (sizeof x/sizeof x[0])
 #define        highestof(x)    (numberof(x)-1)
 
 #define        numberof(x)     (sizeof x/sizeof x[0])
 #define        highestof(x)    (numberof(x)-1)


@@ -10,7 +28,7 @@
 #define        ClearElement(x)         bzero((char *)&x, sizeof x)
 #define        ClearArray(x)           bzero((char *)x, sizeof x)
 #else  /* defined(unix) */
 #define        ClearElement(x)         bzero((char *)&x, sizeof x)
 #define        ClearArray(x)           bzero((char *)x, sizeof x)
 #else  /* defined(unix) */

-#define        ClearStructure(x)       memset((char *)&x, 0, sizeof x)
+#define        ClearElement(x)         memset((char *)&x, 0, sizeof x)

 #define        ClearArray(x)           memset((char *)x, 0, sizeof x)
 #endif /* defined(unix) */
 
 #define        ClearArray(x)           memset((char *)x, 0, sizeof x)
 #endif /* defined(unix) */
 


@@ -20,11 +38,12 @@
 #define        memset(s,c,n)           if (c == 0) { \
                                    bzero(s,n); \
                                } else { \
 #define        memset(s,c,n)           if (c == 0) { \
                                    bzero(s,n); \
                                } else { \

-                                   char buffer[100]; \
-                                   \
-                                   sprintf( \
-                                   "Attempt to use memchr(, != 0,) in %s, %s.\n, \
-                                               __FILE__, __LINE__); \
-                                   ExitString(stderr, buffer, 1); \
+                                   register char *src = s; \
+                                   register int count = n; \
+                                       \
+                                   while (count--) { \
+                                       *src++ = c; \
+                                   } \

                                }
                                }

+#define        memcmp(s1,s2,n)         bcmp(s1,s2,n)

 #endif /* defined(unix) */
 #endif /* defined(unix) */