BSD 4_2 release

[unix-history] / usr / src / usr.bin / refer / deliv2.c

diff --git a/usr/src/usr.bin/refer/deliv2.c b/usr/src/usr.bin/refer/deliv2.c
index 2405991..3c88edf 100644 (file)
--- a/usr/src/usr.bin/refer/deliv2.c
+++ b/usr/src/usr.bin/refer/deliv2.c
@@ -1,47 +1,58 @@
-# include "stdio.h"
+#ifndef lint
+static char *sccsid = "@(#)deliv2.c    4.1 (Berkeley) 5/6/83";
+#endif
+
+#include <stdio.h>
+

 hash (s)
 hash (s)

-       char *s;
+char *s;

 {
 {

-int c, n;
-for(n=0; c= *s; s++)
-       n += (c*n+ c << (n%4));
-return(n>0 ? n : -n);
+       int c, n;
+       for(n=0; c= *s; s++)
+               n += (c*n+ c << (n%4));
+       return(n>0 ? n : -n);

 }
 }

+

 err (s, a)
 err (s, a)

-       char *s;
+char *s;

 {
 {

-fprintf(stderr, "Error: ");
-fprintf(stderr, s, a);
-putc('\n', stderr);
-exit(1);
+       fprintf(stderr, "Error: ");
+       fprintf(stderr, s, a);
+       putc('\n', stderr);
+       exit(1);

 }
 }

+

 prefix(t, s)
 prefix(t, s)

-       char *t, *s;
+char *t, *s;

 {
 {

-int c, d;
-while ( (c= *t++) == *s++)
-       if (c==0) return(1);
-return(c==0 ? 1: 0);
+       int c;
+
+       while ((c= *t++) == *s++)
+               if (c==0) return(1);
+       return(c==0 ? 1: 0);

 }
 }

+

 char *
 mindex(s, c)
 char *
 mindex(s, c)

-       char *s;
+char *s;

 {
 {

-register char *p;
-for( p=s; *p; p++)
-       if (*p ==c)
-               return(p);
-return(0);
+       register char *p;
+       for( p=s; *p; p++)
+               if (*p ==c)
+                       return(p);
+       return(0);

 }
 }

+

 zalloc(m,n)
 {
 zalloc(m,n)
 {

+       char *calloc();

        int t;
 # if D1
        int t;
 # if D1

-fprintf(stderr, "calling calloc for %d*%d bytes\n",m,n);
+       fprintf(stderr, "calling calloc for %d*%d bytes\n",m,n);

 # endif
 # endif

-t = calloc(m,n);
+       t = (int) calloc(m,n);

 # if D1
 # if D1

-fprintf(stderr, "calloc returned %o\n", t);
+       fprintf(stderr, "calloc returned %o\n", t);

 # endif
 # endif

-return(t);
+       return(t);

 }
 }