Merge branch 'blead' of git+ssh://perl5.git.perl.org/perl into blead

[p5sagit/p5-mst-13.2.git] / x2p / util.c

diff --git a/x2p/util.c b/x2p/util.c
index e8b666f..464dd8f 100644 (file)
--- 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,19 +12,16 @@
 #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 */
 
 
 Malloc_t
-safemalloc(size)
-MEM_SIZE size;
+safemalloc(MEM_SIZE size)
 {
     Malloc_t ptr;
 
@@ -33,24 +29,23 @@ MEM_SIZE size;
     ptr = malloc(size ? size : 1);
 #ifdef DEBUGGING
     if (debug & 128)
-       fprintf(stderr,"0x%lx: (%05d) malloc %d bytes\n",(unsigned long)ptr,
-               an++,size);
+       fprintf(stderr,"0x%lx: (%05d) malloc %ld bytes\n",(unsigned long)ptr,
+               an++,(long)size);
 #endif
-    if (ptr != Nullch)
+    if (ptr != NULL)
        return ptr;
     else {
        fputs(nomem,stdout) FLUSH;
        exit(1);
     }
     /*NOTREACHED*/
+    return 0;
 }
 
 /* paranoid version of realloc */
 
 Malloc_t
-saferealloc(where,size)
-Malloc_t where;
-MEM_SIZE size;
+saferealloc(Malloc_t where, MEM_SIZE size)
 {
     Malloc_t ptr;
 
@@ -59,23 +54,23 @@ MEM_SIZE size;
 #ifdef DEBUGGING
     if (debug & 128) {
        fprintf(stderr,"0x%lx: (%05d) rfree\n",(unsigned long)where,an++);
-       fprintf(stderr,"0x%lx: (%05d) realloc %d bytes\n",(unsigned long)ptr,an++,size);
+       fprintf(stderr,"0x%lx: (%05d) realloc %ld bytes\n",(unsigned long)ptr,an++,(long)size);
     }
 #endif
-    if (ptr != Nullch)
+    if (ptr != NULL)
        return ptr;
     else {
        fputs(nomem,stdout) FLUSH;
        exit(1);
     }
     /*NOTREACHED*/
+    return 0;
 }
 
 /* safe version of free */
 
 Free_t
-safefree(where)
-Malloc_t where;
+safefree(Malloc_t where)
 {
 #ifdef DEBUGGING
     if (debug & 128)
@@ -84,28 +79,10 @@ Malloc_t where;
     free(where);
 }
 
-/* safe version of string copy */
-
-char *
-safecpy(to,from,len)
-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 *
-cpytill(to,from,delim)
-register char *to, *from;
-register int delim;
+cpytill(register char *to, register char *from, register int delim)
 {
     for (; *from; from++,to++) {
        if (*from == '\\') {
@@ -124,9 +101,7 @@ register int delim;
 
 
 char *
-cpy2(to,from,delim)
-register char *to, *from;
-register int delim;
+cpy2(register char *to, register char *from, register int delim)
 {
     for (; *from; from++,to++) {
        if (*from == '\\')
@@ -144,32 +119,30 @@ register int delim;
 /* return ptr to little string in big string, NULL if not found */
 
 char *
-instr(big, little)
-char *big, *little;
-
+instr(char *big, const char *little)
 {
-    register char *t, *s, *x;
+    register char *t, *x;
+    register const char *s;
 
     for (t = big; *t; t++) {
        for (x=t,s=little; *s; x++,s++) {
            if (!*x)
-               return Nullch;
+               return NULL;
            if (*s != *x)
                break;
        }
        if (!*s)
            return t;
     }
-    return Nullch;
+    return NULL;
 }
 
 /* copy a string to a safe spot */
 
 char *
-savestr(str)
-char *str;
+savestr(const char *str)
 {
-    register char *newaddr = safemalloc((MEM_SIZE)(strlen(str)+1));
+    register char * const newaddr = (char *) safemalloc((MEM_SIZE)(strlen(str)+1));
 
     (void)strcpy(newaddr,str);
     return newaddr;
@@ -178,77 +151,44 @@ char *str;
 /* grow a static string to at least a certain length */
 
 void
-growstr(strptr,curlen,newlen)
-char **strptr;
-int *curlen;
-int newlen;
+growstr(char **strptr, int *curlen, int newlen)
 {
     if (newlen > *curlen) {            /* need more room? */
        if (*curlen)
-           *strptr = saferealloc(*strptr,(MEM_SIZE)newlen);
+           *strptr = (char *) saferealloc(*strptr,(MEM_SIZE)newlen);
        else
-           *strptr = safemalloc((MEM_SIZE)newlen);
+           *strptr = (char *) safemalloc((MEM_SIZE)newlen);
        *curlen = 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