X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=x2p%2Futil.c;h=6994e873f753e8be9add4a1ac1c834feae7c2d85;hb=c74c7a1e27c5e7f7e00419dd2667079018fc7d6f;hp=f8e342cb5418104f2e27139d46d3c983af5238aa;hpb=e9cb6d146cf75820a5771a80b499a65f1217c427;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/x2p/util.c b/x2p/util.c
index f8e342c..6994e87 100644
--- a/x2p/util.c
+++ b/x2p/util.c
@@ -1,11 +1,10 @@
-/* $RCSfile: util.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:29 $
+/*    util.c
  *
- *    Copyright (c) 1991-1997, Larry Wall
+ *    Copyright (C) 1991, 1992, 1993, 1994, 1995, 1996, 1997, 1999,
+ *    2000, 2001, 2005 by Larry Wall and others
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
- *
- * $Log:	util.c,v $
  */
 
 #include "EXTERN.h"
@@ -13,12 +12,10 @@
 #include "INTERN.h"
 #include "util.h"
 
-#ifdef I_STDARG
-#  include <stdarg.h>
-#endif
+#include <stdarg.h>
 #define FLUSH
 
-static char nomem[] = "Out of memory!\n";
+static const char nomem[] = "Out of memory!\n";
 
 /* paranoid version of malloc */
 
@@ -42,6 +39,7 @@ safemalloc(MEM_SIZE size)
 	exit(1);
     }
     /*NOTREACHED*/
+    return 0;
 }
 
 /* paranoid version of realloc */
@@ -66,6 +64,7 @@ saferealloc(Malloc_t where, MEM_SIZE size)
 	exit(1);
     }
     /*NOTREACHED*/
+    return 0;
 }
 
 /* safe version of free */
@@ -80,19 +79,6 @@ safefree(Malloc_t where)
     free(where);
 }
 
-/* safe version of string copy */
-
-char *
-safecpy(char *to, register char *from, register int len)
-{
-    register char *dest = to;
-
-    if (from != Nullch) 
-	for (len--; len && (*dest++ = *from++); len--) ;
-    *dest = '\0';
-    return to;
-}
-
 /* copy a string up to some (non-backslashed) delimiter, if any */
 
 char *
@@ -155,7 +141,7 @@ instr(char *big, char *little)
 char *
 savestr(char *str)
 {
-    register char *newaddr = (char *) safemalloc((MEM_SIZE)(strlen(str)+1));
+    register char * const newaddr = (char *) safemalloc((MEM_SIZE)(strlen(str)+1));
 
     (void)strcpy(newaddr,str);
     return newaddr;
@@ -176,62 +162,32 @@ growstr(char **strptr, int *curlen, int newlen)
 }
 
 void
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
-croak(char *pat,...)
-#else /* I_STDARG */
-/*VARARGS1*/
-croak(pat,a1,a2,a3,a4)
-    char *pat;
-    int a1,a2,a3,a4;
-#endif /* I_STDARG */
+fatal(const char *pat,...)
 {
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
+#if defined(HAS_VPRINTF)
     va_list args;
 
     va_start(args, pat);
     vfprintf(stderr,pat,args);
+    va_end(args);
 #else
     fprintf(stderr,pat,a1,a2,a3,a4);
 #endif
     exit(1);
 }
 
-void
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
-fatal(char *pat,...)
-#else /* I_STDARG */
-/*VARARGS1*/
-fatal(pat,a1,a2,a3,a4)
-    char *pat;
-    int a1,a2,a3,a4;
-#endif /* I_STDARG */
-{
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
-    va_list args;
-
-    va_start(args, pat);
-    vfprintf(stderr,pat,args);
-#else
-    fprintf(stderr,pat,a1,a2,a3,a4);
+#if defined(DARWIN)
+__private_extern__	/* warn() conflicts with libc */
 #endif
-    exit(1);
-}
-
 void
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
-warn(char *pat,...)
-#else /* I_STDARG */
-/*VARARGS1*/
-warn(pat,a1,a2,a3,a4)
-    char *pat;
-    int a1,a2,a3,a4;
-#endif /* I_STDARG */
+warn(const char *pat,...)
 {
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
+#if defined(HAS_VPRINTF)
     va_list args;
 
     va_start(args, pat);
     vfprintf(stderr,pat,args);
+    va_end(args);
 #else
     fprintf(stderr,pat,a1,a2,a3,a4);
 #endif