EBADFORMAT -> EFTYPE

SCCS-vsn: sys/sys/errno.h 7.12
SCCS-vsn: lib/libc/gen/errlst.c 5.9
SCCS-vsn: lib/libc/gen/disklabel.c 5.15
SCCS-vsn: lib/libc/gen/fstab.c 5.14

diff --git a/usr/src/lib/libc/gen/disklabel.c b/usr/src/lib/libc/gen/disklabel.c
index c19e352..c68f4c4 100644 (file)
--- a/usr/src/lib/libc/gen/disklabel.c
+++ b/usr/src/lib/libc/gen/disklabel.c
@@ -6,7 +6,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)disklabel.c        5.14 (Berkeley) %G%";
+static char sccsid[] = "@(#)disklabel.c        5.15 (Berkeley) %G%";

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


@@ -168,7 +168,7 @@ dgetent(bp, name)
                                break;
                        }
                        if (cp >= bp+BUFSIZ) {
                                break;
                        }
                        if (cp >= bp+BUFSIZ) {

-                               error(EBADFORMAT);
+                               error(EFTYPE);

                                break;
                        } else
                                *cp++ = c;
                                break;
                        } else
                                *cp++ = c;

diff --git a/usr/src/lib/libc/gen/errlst.c b/usr/src/lib/libc/gen/errlst.c
index 9c5366f..574634b 100644 (file)
--- a/usr/src/lib/libc/gen/errlst.c
+++ b/usr/src/lib/libc/gen/errlst.c
@@ -6,7 +6,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)errlst.c   5.8 (Berkeley) %G%";
+static char sccsid[] = "@(#)errlst.c   5.9 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 char *sys_errlist[] = {
 #endif /* LIBC_SCCS and not lint */
 
 char *sys_errlist[] = {


@@ -107,7 +107,7 @@ char *sys_errlist[] = {
 
        "No locks available",                   /* 77 - ENOLCK */
        "Function not implemented",             /* 78 - ENOSYS */
 
        "No locks available",                   /* 77 - ENOLCK */
        "Function not implemented",             /* 78 - ENOSYS */

-       "Incorrect format",                     /* 79 - EBADFORMAT */
+       "Inappropriate file type or format",    /* 79 - EFTYPE */

 };
 int errno;
 int sys_nerr = { sizeof sys_errlist/sizeof sys_errlist[0] };
 };
 int errno;
 int sys_nerr = { sizeof sys_errlist/sizeof sys_errlist[0] };

diff --git a/usr/src/lib/libc/gen/fstab.c b/usr/src/lib/libc/gen/fstab.c
index dbcbce2..1aff35f 100644 (file)
--- a/usr/src/lib/libc/gen/fstab.c
+++ b/usr/src/lib/libc/gen/fstab.c
@@ -6,7 +6,7 @@
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)
  */
 
 #if defined(LIBC_SCCS) && !defined(lint)

-static char sccsid[] = "@(#)fstab.c    5.13 (Berkeley) %G%";
+static char sccsid[] = "@(#)fstab.c    5.14 (Berkeley) %G%";

 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/errno.h>
 #endif /* LIBC_SCCS and not lint */
 
 #include <sys/errno.h>


@@ -102,7 +102,7 @@ fstabscan()
                        return(1);
 
 bad:           /* no way to distinguish between EOF and syntax error */
                        return(1);
 
 bad:           /* no way to distinguish between EOF and syntax error */

-               write(EBADFORMAT);
+               write(EFTYPE);

        }
        /* NOTREACHED */
 }
        }
        /* NOTREACHED */
 }

diff --git a/usr/src/sys/sys/errno.h b/usr/src/sys/sys/errno.h
index 5331857..87eac64 100644 (file)
--- a/usr/src/sys/sys/errno.h
+++ b/usr/src/sys/sys/errno.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)errno.h     7.11 (Berkeley) %G%
+ *     @(#)errno.h     7.12 (Berkeley) %G%

  */
 
 #ifndef KERNEL
  */
 
 #ifndef KERNEL


@@ -118,7 +118,7 @@ extern int errno;                   /* global error number */
 #define        ENOLCK          77              /* No locks available */
 #define        ENOSYS          78              /* Function not implemented */
 
 #define        ENOLCK          77              /* No locks available */
 #define        ENOSYS          78              /* Function not implemented */
 

-#define        EBADFORMAT      79              /* Incorrect format */
+#define        EFTYPE          79              /* Inappropriate file type or format */

 
 #ifdef KERNEL
 /* pseudo-errors returned inside kernel to modify return to process */
 
 #ifdef KERNEL
 /* pseudo-errors returned inside kernel to modify return to process */