rename local gets to prevent conflict with stdio

SCCS-vsn: usr.bin/plot/driver.c 4.3
SCCS-vsn: usr.bin/plot/crtdriver.c 4.2
SCCS-vsn: usr.bin/plot/debug.c 4.2
SCCS-vsn: usr.bin/plot/atoplot.c 4.2
SCCS-vsn: usr.bin/plot/plottoa.c 4.2

diff --git a/usr/src/usr.bin/plot/atoplot.c b/usr/src/usr.bin/plot/atoplot.c
index e1e6e75..ca234e0 100644 (file)
--- a/usr/src/usr.bin/plot/atoplot.c
+++ b/usr/src/usr.bin/plot/atoplot.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)atoplot.c  4.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)atoplot.c  4.2 (Berkeley) %G%";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -63,7 +63,7 @@ fplt(fin)  FILE *fin; {
                        line(x0,y0,x1,y1);
                        break;
                case 't':
                        line(x0,y0,x1,y1);
                        break;
                case 't':

-                       gets(s,fin);
+                       getstr(s,fin);

                        label(s);
                        break;
                case 'e':
                        label(s);
                        break;
                case 'e':


@@ -102,7 +102,7 @@ fplt(fin)  FILE *fin; {
                        circle(xi,yi,r);
                        break;
                case 'f':
                        circle(xi,yi,r);
                        break;
                case 'f':

-                       gets(s,fin);
+                       getstr(s,fin);

                        linemod( mapLineType(s) );
                        break;
                case 'd':
                        linemod( mapLineType(s) );
                        break;
                case 'd':


@@ -131,12 +131,11 @@ getsi(fin)  FILE *fin; {  /* get an integer stored in 2 ascii bytes. */
        }
        return( i );
 }
        }
        return( i );
 }

-gets(s,fin)  char *s;  FILE *fin; {
+getstr(s,fin)  char *s;  FILE *fin; {

        for( ; *s = getc(fin); s++)
                if(*s == '\n')
                        break;
        *s = '\0';
        for( ; *s = getc(fin); s++)
                if(*s == '\n')
                        break;
        *s = '\0';

-       return;

 }
 
 char   *lineMap[] = {
 }
 
 char   *lineMap[] = {

diff --git a/usr/src/usr.bin/plot/crtdriver.c b/usr/src/usr.bin/plot/crtdriver.c
index ec86bac..d696e25 100644 (file)
--- a/usr/src/usr.bin/plot/crtdriver.c
+++ b/usr/src/usr.bin/plot/crtdriver.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)crtdriver.c        4.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)crtdriver.c        4.2 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -71,7 +71,7 @@ fplt(fin)  FILE *fin; {
                        line(x0,y0,x1,y1);
                        break;
                case 't':
                        line(x0,y0,x1,y1);
                        break;
                case 't':

-                       gets(s,fin);
+                       getstr(s,fin);

                        label(s);
                        break;
                case 'e':
                        label(s);
                        break;
                case 'e':


@@ -110,7 +110,7 @@ fplt(fin)  FILE *fin; {
                        circle(xi,yi,r);
                        break;
                case 'f':
                        circle(xi,yi,r);
                        break;
                case 'f':

-                       gets(s,fin);
+                       getstr(s,fin);

                        linemod(s);
                        break;
                default:
                        linemod(s);
                        break;
                default:


@@ -129,10 +129,9 @@ getsi(fin)  FILE *fin; {   /* get an integer stored in 2 ascii bytes. */
        a = a<<8;
        return(a|b);
 }
        a = a<<8;
        return(a|b);
 }

-gets(s,fin)  char *s;  FILE *fin; {
+getstr(s,fin)  char *s;  FILE *fin; {

        for( ; *s = getc(fin); s++)
                if(*s == '\n')
                        break;
        *s = '\0';
        for( ; *s = getc(fin); s++)
                if(*s == '\n')
                        break;
        *s = '\0';

-       return;

 }
 }

diff --git a/usr/src/usr.bin/plot/debug.c b/usr/src/usr.bin/plot/debug.c
index 51bfa46..68c5ebe 100644 (file)
--- a/usr/src/usr.bin/plot/debug.c
+++ b/usr/src/usr.bin/plot/debug.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)debug.c    4.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)debug.c    4.2 (Berkeley) %G%";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -59,7 +59,7 @@ fplt(fin)  FILE *fin; {
                        printf("line %d %d   %d %d\n", x0, y0, x1, y1);
                        break;
                case 't':
                        printf("line %d %d   %d %d\n", x0, y0, x1, y1);
                        break;
                case 't':

-                       gets(s,fin);
+                       getstr(s,fin);

                        printf("label %s\n", s);
                        break;
                case 'e':
                        printf("label %s\n", s);
                        break;
                case 'e':


@@ -98,7 +98,7 @@ fplt(fin)  FILE *fin; {
                        printf("circle\n");
                        break;
                case 'f':
                        printf("circle\n");
                        break;
                case 'f':

-                       gets(s,fin);
+                       getstr(s,fin);

                        printf("linemod %s\n", s);
                        break;
                default:
                        printf("linemod %s\n", s);
                        break;
                default:


@@ -117,10 +117,9 @@ getsi(fin)  FILE *fin; {   /* get an integer stored in 2 ascii bytes. */
        a = a<<8;
        return(a|b);
 }
        a = a<<8;
        return(a|b);
 }

-gets(s,fin)  char *s;  FILE *fin; {
+getstr(s,fin)  char *s;  FILE *fin; {

        for( ; *s = getc(fin); s++)
                if(*s == '\n')
                        break;
        *s = '\0';
        for( ; *s = getc(fin); s++)
                if(*s == '\n')
                        break;
        *s = '\0';

-       return;

 }
 }

diff --git a/usr/src/usr.bin/plot/driver.c b/usr/src/usr.bin/plot/driver.c
index 1907e80..f779719 100644 (file)
--- a/usr/src/usr.bin/plot/driver.c
+++ b/usr/src/usr.bin/plot/driver.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)driver.c   4.2 (Berkeley) %G%";
+static char sccsid[] = "@(#)driver.c   4.3 (Berkeley) %G%";

 #endif
 
 #include <stdio.h>
 #endif
 
 #include <stdio.h>


@@ -61,7 +61,7 @@ fplt(fin)  FILE *fin; {
                        line(x0,y0,x1,y1);
                        break;
                case 't':
                        line(x0,y0,x1,y1);
                        break;
                case 't':

-                       gets(s,fin);
+                       getstr(s,fin);

                        label(s);
                        break;
                case 'e':
                        label(s);
                        break;
                case 'e':


@@ -100,7 +100,7 @@ fplt(fin)  FILE *fin; {
                        circle(xi,yi,r);
                        break;
                case 'f':
                        circle(xi,yi,r);
                        break;
                case 'f':

-                       gets(s,fin);
+                       getstr(s,fin);

                        linemod(s);
                        break;
                case 'd':
                        linemod(s);
                        break;
                case 'd':


@@ -124,10 +124,9 @@ getsi(fin)  FILE *fin; {   /* get an integer stored in 2 ascii bytes. */
        a = a<<8;
        return(a|b);
 }
        a = a<<8;
        return(a|b);
 }

-gets(s,fin)  char *s;  FILE *fin; {
+getstr(s,fin)  char *s;  FILE *fin; {

        for( ; *s = getc(fin); s++)
                if(*s == '\n')
                        break;
        *s = '\0';
        for( ; *s = getc(fin); s++)
                if(*s == '\n')
                        break;
        *s = '\0';

-       return;

 }
 }

diff --git a/usr/src/usr.bin/plot/plottoa.c b/usr/src/usr.bin/plot/plottoa.c
index c3e88a7..60f1c0f 100644 (file)
--- a/usr/src/usr.bin/plot/plottoa.c
+++ b/usr/src/usr.bin/plot/plottoa.c
@@ -1,5 +1,5 @@
 #ifndef lint
 #ifndef lint

-static char sccsid[] = "@(#)plottoa.c  4.1 (Berkeley) %G%";
+static char sccsid[] = "@(#)plottoa.c  4.2 (Berkeley) %G%";

 #endif
 
 /*
 #endif
 
 /*


@@ -68,7 +68,7 @@ FILE *fin;
                        line(x0,y0,x1,y1);
                        break;
                case 't':
                        line(x0,y0,x1,y1);
                        break;
                case 't':

-                       gets(s,fin);
+                       getstr(s,fin);

                        label(s);
                        break;
                case 'e':
                        label(s);
                        break;
                case 'e':


@@ -107,7 +107,7 @@ FILE *fin;
                        circle(xi,yi,r);
                        break;
                case 'f':
                        circle(xi,yi,r);
                        break;
                case 'f':

-                       gets(s,fin);
+                       getstr(s,fin);

                        linemod(s);
                        break;
                case 'd':
                        linemod(s);
                        break;
                case 'd':


@@ -136,7 +136,7 @@ FILE *fin;
        return(a|b);
 }
 
        return(a|b);
 }
 

-gets(s,fin)
+getstr(s,fin)

 char *s;
 FILE *fin;
 {
 char *s;
 FILE *fin;
 {


@@ -144,7 +144,6 @@ FILE *fin;
                if(*s == '\n')
                        break;
        *s = '\0';
                if(*s == '\n')
                        break;
        *s = '\0';

-       return;

 }
 
 /* Print out the arguments to plot routines. */
 }
 
 /* Print out the arguments to plot routines. */