Placate nervous compilers that see longer than ints switch()ing.

[perl5.git] / x2p / str.c

diff --git a/x2p/str.c b/x2p/str.c
index ceea2e5..b820a8d 100644 (file)
--- a/x2p/str.c
+++ b/x2p/str.c
@@ -1,29 +1,19 @@
 /* $RCSfile: str.c,v $$Revision: 4.1 $$Date: 92/08/07 18:29:26 $
  *
- *    Copyright (c) 1991, Larry Wall
+ *    Copyright (c) 1991-1997, Larry Wall
  *
  *    You may distribute under the terms of either the GNU General Public
  *    License or the Artistic License, as specified in the README file.
  *
  * $Log:       str.c,v $
- * Revision 4.1  92/08/07  18:29:26  lwall
- * 
- * Revision 4.0.1.1  91/06/07  12:20:08  lwall
- * patch4: new copyright notice
- * 
- * Revision 4.0  91/03/20  01:58:15  lwall
- * 4.0 baseline.
- * 
  */
 
-#include "handy.h"
 #include "EXTERN.h"
-#include "util.h"
 #include "a2p.h"
+#include "util.h"
 
-str_numset(str,num)
-register STR *str;
-double num;
+void
+str_numset(register STR *str, double num)
 {
     str->str_nval = num;
     str->str_pok = 0;          /* invalidate pointer */
@@ -31,8 +21,7 @@ double num;
 }
 
 char *
-str_2ptr(str)
-register STR *str;
+str_2ptr(register STR *str)
 {
     register char *s;
 
@@ -49,14 +38,13 @@ register STR *str;
     str->str_pok = 1;
 #ifdef DEBUGGING
     if (debug & 32)
-       fprintf(stderr,"0x%lx ptr(%s)\n",str,str->str_ptr);
+       fprintf(stderr,"0x%lx ptr(%s)\n",(unsigned long)str,str->str_ptr);
 #endif
     return str->str_ptr;
 }
 
 double
-str_2num(str)
-register STR *str;
+str_2num(register STR *str)
 {
     if (!str)
        return 0.0;
@@ -67,14 +55,13 @@ register STR *str;
     str->str_nok = 1;
 #ifdef DEBUGGING
     if (debug & 32)
-       fprintf(stderr,"0x%lx num(%g)\n",str,str->str_nval);
+       fprintf(stderr,"0x%lx num(%g)\n",(unsigned long)str,str->str_nval);
 #endif
     return str->str_nval;
 }
 
-str_sset(dstr,sstr)
-STR *dstr;
-register STR *sstr;
+void
+str_sset(STR *dstr, register STR *sstr)
 {
     if (!sstr)
        str_nset(dstr,No,0);
@@ -86,10 +73,8 @@ register STR *sstr;
        str_nset(dstr,"",0);
 }
 
-str_nset(str,ptr,len)
-register STR *str;
-register char *ptr;
-register int len;
+void
+str_nset(register STR *str, register char *ptr, register int len)
 {
     GROWSTR(&(str->str_ptr), &(str->str_len), len + 1);
     bcopy(ptr,str->str_ptr,len);
@@ -99,9 +84,8 @@ register int len;
     str->str_pok = 1;          /* validate pointer */
 }
 
-str_set(str,ptr)
-register STR *str;
-register char *ptr;
+void
+str_set(register STR *str, register char *ptr)
 {
     register int len;
 
@@ -115,9 +99,10 @@ register char *ptr;
     str->str_pok = 1;          /* validate pointer */
 }
 
-str_chop(str,ptr)      /* like set but assuming ptr is in str */
-register STR *str;
-register char *ptr;
+void
+str_chop(register STR *str, register char *ptr)        /* like set but assuming ptr is in str */
+                  
+                   
 {
     if (!(str->str_pok))
        str_2ptr(str);
@@ -127,10 +112,8 @@ register char *ptr;
     str->str_pok = 1;          /* validate pointer */
 }
 
-str_ncat(str,ptr,len)
-register STR *str;
-register char *ptr;
-register int len;
+void
+str_ncat(register STR *str, register char *ptr, register int len)
 {
     if (!(str->str_pok))
        str_2ptr(str);
@@ -142,9 +125,8 @@ register int len;
     str->str_pok = 1;          /* validate pointer */
 }
 
-str_scat(dstr,sstr)
-STR *dstr;
-register STR *sstr;
+void
+str_scat(STR *dstr, register STR *sstr)
 {
     if (!(sstr->str_pok))
        str_2ptr(sstr);
@@ -152,9 +134,8 @@ register STR *sstr;
        str_ncat(dstr,sstr->str_ptr,sstr->str_cur);
 }
 
-str_cat(str,ptr)
-register STR *str;
-register char *ptr;
+void
+str_cat(register STR *str, register char *ptr)
 {
     register int len;
 
@@ -171,11 +152,7 @@ register char *ptr;
 }
 
 char *
-str_append_till(str,from,delim,keeplist)
-register STR *str;
-register char *from;
-register int delim;
-char *keeplist;
+str_append_till(register STR *str, register char *from, register int delim, char *keeplist)
 {
     register char *to;
     register int len;
@@ -195,7 +172,7 @@ char *keeplist;
                else
                    *to++ = *from++;
            }
-           else if (index(keeplist,from[1]))
+           else if (strchr(keeplist,from[1]))
                *to++ = *from++;
            else
                from++;
@@ -210,8 +187,7 @@ char *keeplist;
 }
 
 STR *
-str_new(len)
-int len;
+str_new(int len)
 {
     register STR *str;
     
@@ -229,9 +205,7 @@ int len;
 }
 
 void
-str_grow(str,len)
-register STR *str;
-int len;
+str_grow(register STR *str, int len)
 {
     if (len && str)
        GROWSTR(&(str->str_ptr), &(str->str_len), len + 1);
@@ -240,9 +214,7 @@ int len;
 /* make str point to what nstr did */
 
 void
-str_replace(str,nstr)
-register STR *str;
-register STR *nstr;
+str_replace(register STR *str, register STR *nstr)
 {
     safefree(str->str_ptr);
     str->str_ptr = nstr->str_ptr;
@@ -255,8 +227,7 @@ register STR *nstr;
 }
 
 void
-str_free(str)
-register STR *str;
+str_free(register STR *str)
 {
     if (!str)
        return;
@@ -269,8 +240,8 @@ register STR *str;
     freestrroot = str;
 }
 
-str_len(str)
-register STR *str;
+int
+str_len(register STR *str)
 {
     if (!str)
        return 0;
@@ -283,11 +254,10 @@ register STR *str;
 }
 
 char *
-str_gets(str,fp)
-register STR *str;
-register FILE *fp;
+str_gets(register STR *str, register FILE *fp)
 {
-#ifdef STDSTDIO                /* Here is some breathtakingly efficient cheating */
+#if defined(USE_STDIO_PTR) && defined(STDIO_PTR_LVALUE) && defined(STDIO_CNT_LVALUE)
+    /* Here is some breathtakingly efficient cheating */
 
     register char *bp;         /* we're going to steal some values */
     register int cnt;          /*  from the stdio struct and put EVERYTHING */
@@ -296,13 +266,23 @@ register FILE *fp;
     int i;
     int bpx;
 
-    cnt = fp->_cnt;                    /* get count into register */
+#if defined(VMS)
+    /* An ungetc()d char is handled separately from the regular
+     * buffer, so we getc() it back out and stuff it in the buffer.
+     */
+    i = getc(fp);
+    if (i == EOF) return Nullch;
+    *(--((*fp)->_ptr)) = (unsigned char) i;
+    (*fp)->_cnt++;
+#endif
+
+    cnt = FILE_cnt(fp);                        /* get count into register */
     str->str_nok = 0;                  /* invalidate number */
     str->str_pok = 1;                  /* validate pointer */
     if (str->str_len <= cnt)           /* make sure we have the room */
        GROWSTR(&(str->str_ptr), &(str->str_len), cnt+1);
     bp = str->str_ptr;                 /* move these two too to registers */
-    ptr = fp->_ptr;
+    ptr = FILE_ptr(fp);
     for (;;) {
        while (--cnt >= 0) {
            if ((*bp++ = *ptr++) == newline)
@@ -314,11 +294,11 @@ register FILE *fp;
                }
        }
        
-       fp->_cnt = cnt;                 /* deregisterize cnt and ptr */
-       fp->_ptr = ptr;
-       i = _filbuf(fp);                /* get more characters */
-       cnt = fp->_cnt;
-       ptr = fp->_ptr;                 /* reregisterize cnt and ptr */
+       FILE_cnt(fp) = cnt;             /* deregisterize cnt and ptr */
+       FILE_ptr(fp) = ptr;
+       i = getc(fp);           /* get more characters */
+       cnt = FILE_cnt(fp);
+       ptr = FILE_ptr(fp);             /* reregisterize cnt and ptr */
 
        bpx = bp - str->str_ptr;        /* prepare for possible relocation */
        GROWSTR(&(str->str_ptr), &(str->str_len), str->str_cur + cnt + 1);
@@ -334,12 +314,13 @@ register FILE *fp;
     }
 
 thats_all_folks:
-    fp->_cnt = cnt;                    /* put these back or we're in trouble */
-    fp->_ptr = ptr;
+    FILE_cnt(fp) = cnt;                        /* put these back or we're in trouble */
+    FILE_ptr(fp) = ptr;
     *bp = '\0';
     str->str_cur = bp - str->str_ptr;  /* set length */
 
-#else /* !STDSTDIO */  /* The big, slow, and stupid way */
+#else /* USE_STDIO_PTR && STDIO_PTR_LVALUE && STDIO_CNT_LVALUE */
+    /* The big, slow, and stupid way */
 
     static char buf[4192];
 
@@ -348,14 +329,13 @@ thats_all_folks:
     else
        str_set(str, No);
 
-#endif /* STDSTDIO */
+#endif /* USE_STDIO_PTR && STDIO_PTR_LVALUE && STDIO_CNT_LVALUE */
 
     return str->str_cur ? str->str_ptr : Nullch;
 }
 
 void
-str_inc(str)
-register STR *str;
+str_inc(register STR *str)
 {
     register char *d;
 
@@ -391,8 +371,7 @@ register STR *str;
 }
 
 void
-str_dec(str)
-register STR *str;
+str_dec(register STR *str)
 {
     register char *d;
 
@@ -424,8 +403,7 @@ register STR *str;
 /* make a string that will exist for the duration of the expression eval */
 
 STR *
-str_mortal(oldstr)
-STR *oldstr;
+str_mortal(STR *oldstr)
 {
     register STR *str = str_new(0);
     static long tmps_size = -1;
@@ -446,8 +424,7 @@ STR *oldstr;
 }
 
 STR *
-str_make(s)
-char *s;
+str_make(char *s)
 {
     register STR *str = str_new(0);
 
@@ -456,8 +433,7 @@ char *s;
 }
 
 STR *
-str_nmake(n)
-double n;
+str_nmake(double n)
 {
     register STR *str = str_new(0);