Remove old version of Fatal.t test, now moved under lib/autodie/t

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

diff --git a/x2p/util.c b/x2p/util.c
index 6994e87..464dd8f 100644 (file)
--- a/x2p/util.c
+++ b/x2p/util.c
@@ -32,7 +32,7 @@ safemalloc(MEM_SIZE 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;
@@ -57,7 +57,7 @@ saferealloc(Malloc_t where, MEM_SIZE 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;
@@ -119,27 +119,28 @@ cpy2(register char *to, register char *from, register int delim)
 /* return ptr to little string in big string, NULL if not found */
 
 char *
-instr(char *big, char *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(char *str)
+savestr(const char *str)
 {
     register char * const newaddr = (char *) safemalloc((MEM_SIZE)(strlen(str)+1));