rename devname to cdevname, devname(3) now in the C library

SCCS-vsn: sbin/fsck/fsck.h 5.20
SCCS-vsn: sbin/fsck/inode.c 5.25
SCCS-vsn: sbin/fsck/main.c 5.34
SCCS-vsn: sbin/fsck/setup.c 5.43
SCCS-vsn: sbin/fsck/utilities.c 5.37

diff --git a/usr/src/sbin/fsck/fsck.h b/usr/src/sbin/fsck/fsck.h
index ad46514..8744bc6 100644 (file)
--- a/usr/src/sbin/fsck/fsck.h
+++ b/usr/src/sbin/fsck/fsck.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)fsck.h      5.19 (Berkeley) %G%
+ *     @(#)fsck.h      5.20 (Berkeley) %G%

  */
 
 #define        MAXDUP          10      /* limit on dup blks (per inode) */
  */
 
 #define        MAXDUP          10      /* limit on dup blks (per inode) */


@@ -135,7 +135,7 @@ struct inoinfo {
 } **inphead, **inpsort;
 long numdirs, listmax, inplast;
 
 } **inphead, **inpsort;
 long numdirs, listmax, inplast;
 

-char   *devname;               /* name of device being checked */
+char   *cdevname;              /* name of device being checked */

 long   dev_bsize;              /* computed value of DEV_BSIZE */
 long   secsize;                /* actual disk sector size */
 char   nflag;                  /* assume a no response */
 long   dev_bsize;              /* computed value of DEV_BSIZE */
 long   secsize;                /* actual disk sector size */
 char   nflag;                  /* assume a no response */

diff --git a/usr/src/sbin/fsck/inode.c b/usr/src/sbin/fsck/inode.c
index e8fb969..719a7dd 100644 (file)
--- a/usr/src/sbin/fsck/inode.c
+++ b/usr/src/sbin/fsck/inode.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)inode.c    5.24 (Berkeley) %G%";
+static char sccsid[] = "@(#)inode.c    5.25 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -412,7 +412,7 @@ pinode(ino)
                printf("%u ", (unsigned)dp->di_uid);
        printf("MODE=%o\n", dp->di_mode);
        if (preen)
                printf("%u ", (unsigned)dp->di_uid);
        printf("MODE=%o\n", dp->di_mode);
        if (preen)

-               printf("%s: ", devname);
+               printf("%s: ", cdevname);

        printf("SIZE=%qu ", dp->di_size);
        p = ctime(&dp->di_mtime.ts_sec);
        printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]);
        printf("SIZE=%qu ", dp->di_size);
        p = ctime(&dp->di_mtime.ts_sec);
        printf("MTIME=%12.12s %4.4s ", &p[4], &p[20]);

diff --git a/usr/src/sbin/fsck/main.c b/usr/src/sbin/fsck/main.c
index 585fb17..9765670 100644 (file)
--- a/usr/src/sbin/fsck/main.c
+++ b/usr/src/sbin/fsck/main.c
@@ -12,7 +12,7 @@ char copyright[] =
 #endif /* not lint */
 
 #ifndef lint
 #endif /* not lint */
 
 #ifndef lint

-static char sccsid[] = "@(#)main.c     5.33 (Berkeley) %G%";
+static char sccsid[] = "@(#)main.c     5.34 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -148,7 +148,7 @@ checkfilesys(filesys, mntpt, auxdata, child)
 
        if (preen && child)
                (void)signal(SIGQUIT, voidquit);
 
        if (preen && child)
                (void)signal(SIGQUIT, voidquit);

-       devname = filesys;
+       cdevname = filesys;

        if (debug && preen)
                pwarn("starting\n");
        if (setup(filesys) == 0) {
        if (debug && preen)
                pwarn("starting\n");
        if (setup(filesys) == 0) {

diff --git a/usr/src/sbin/fsck/setup.c b/usr/src/sbin/fsck/setup.c
index d109db2..f8ff79e 100644 (file)
--- a/usr/src/sbin/fsck/setup.c
+++ b/usr/src/sbin/fsck/setup.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)setup.c    5.42 (Berkeley) %G%";
+static char sccsid[] = "@(#)setup.c    5.43 (Berkeley) %G%";

 #endif /* not lint */
 
 #define DKTYPENAMES
 #endif /* not lint */
 
 #define DKTYPENAMES


@@ -366,7 +366,7 @@ badsb(listerr, s)
        if (!listerr)
                return;
        if (preen)
        if (!listerr)
                return;
        if (preen)

-               printf("%s: ", devname);
+               printf("%s: ", cdevname);

        pfatal("BAD SUPER BLOCK: %s\n", s);
 }
 
        pfatal("BAD SUPER BLOCK: %s\n", s);
 }
 

diff --git a/usr/src/sbin/fsck/utilities.c b/usr/src/sbin/fsck/utilities.c
index d6e0a36..a34e8f2 100644 (file)
--- a/usr/src/sbin/fsck/utilities.c
+++ b/usr/src/sbin/fsck/utilities.c
@@ -6,7 +6,7 @@
  */
 
 #ifndef lint
  */
 
 #ifndef lint

-static char sccsid[] = "@(#)utilities.c        5.36 (Berkeley) %G%";
+static char sccsid[] = "@(#)utilities.c        5.37 (Berkeley) %G%";

 #endif /* not lint */
 
 #include <sys/param.h>
 #endif /* not lint */
 
 #include <sys/param.h>


@@ -502,11 +502,11 @@ pfatal(s, a1, a2, a3)
 {
 
        if (preen) {
 {
 
        if (preen) {

-               printf("%s: ", devname);
+               printf("%s: ", cdevname);

                printf(s, a1, a2, a3);
                printf("\n");
                printf("%s: UNEXPECTED INCONSISTENCY; RUN fsck MANUALLY.\n",
                printf(s, a1, a2, a3);
                printf("\n");
                printf("%s: UNEXPECTED INCONSISTENCY; RUN fsck MANUALLY.\n",

-                       devname);
+                       cdevname);

                exit(8);
        }
        printf(s, a1, a2, a3);
                exit(8);
        }
        printf(s, a1, a2, a3);


@@ -522,7 +522,7 @@ pwarn(s, a1, a2, a3, a4, a5, a6)
 {
 
        if (preen)
 {
 
        if (preen)

-               printf("%s: ", devname);
+               printf("%s: ", cdevname);

        printf(s, a1, a2, a3, a4, a5, a6);
 }
 
        printf(s, a1, a2, a3, a4, a5, a6);
 }