Added new prototype declarations and cleaned up.

SCCS-vsn: include/glob.h 5.3
SCCS-vsn: include/netdb.h 5.12
SCCS-vsn: include/stdlib.h 5.8
SCCS-vsn: include/time.h 5.10
SCCS-vsn: include/vis.h 5.6

diff --git a/usr/src/include/glob.h b/usr/src/include/glob.h
index b6843c4..898a04c 100644 (file)
--- a/usr/src/include/glob.h
+++ b/usr/src/include/glob.h
@@ -7,7 +7,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)glob.h      5.2 (Berkeley) %G%
+ *     @(#)glob.h      5.3 (Berkeley) %G%

  */
 
 typedef struct {
  */
 
 typedef struct {


@@ -32,4 +32,9 @@ typedef struct {
 #define        GLOB_NOSPACE    (-1)    /* malloc call failed */
 #define        GLOB_ABEND      (-2)    /* unignored error */
 
 #define        GLOB_NOSPACE    (-1)    /* malloc call failed */
 #define        GLOB_ABEND      (-2)    /* unignored error */
 

-void globfree();
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+int glob __P((const char *, int, const int (*)(char *, int), glob_t *));
+void globfree __P((glob_t *));
+__END_DECLS

diff --git a/usr/src/include/netdb.h b/usr/src/include/netdb.h
index 4637338..1015198 100644 (file)
--- a/usr/src/include/netdb.h
+++ b/usr/src/include/netdb.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)netdb.h     5.11 (Berkeley) %G%
+ *     @(#)netdb.h     5.12 (Berkeley) %G%

  */
 
 #define        _PATH_HEQUIV    "/etc/hosts.equiv"
  */
 
 #define        _PATH_HEQUIV    "/etc/hosts.equiv"


@@ -50,11 +50,6 @@ struct       protoent {
        int     p_proto;        /* protocol # */
 };
 
        int     p_proto;        /* protocol # */
 };
 

-struct hostent *gethostbyname(), *gethostbyaddr(), *gethostent();
-struct netent  *getnetbyname(), *getnetbyaddr(), *getnetent();
-struct servent *getservbyname(), *getservbyport(), *getservent();
-struct protoent        *getprotobyname(), *getprotobynumber(), *getprotoent();
-

 /*
  * Error return codes from gethostbyname() and gethostbyaddr()
  * (left in extern int h_errno).
 /*
  * Error return codes from gethostbyname() and gethostbyaddr()
  * (left in extern int h_errno).


@@ -65,3 +60,30 @@ struct protoent      *getprotobyname(), *getprotobynumber(), *getprotoent();
 #define        NO_RECOVERY     3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
 #define        NO_DATA         4 /* Valid name, no data record of requested type */
 #define        NO_ADDRESS      NO_DATA         /* no address, look for MX record */
 #define        NO_RECOVERY     3 /* Non recoverable errors, FORMERR, REFUSED, NOTIMP */
 #define        NO_DATA         4 /* Valid name, no data record of requested type */
 #define        NO_ADDRESS      NO_DATA         /* no address, look for MX record */

+
+#include <sys/cdefs.h>
+
+__BEGIN_DECLS
+void           endhostent __P((void));
+void           endnetent __P((void));
+void           endprotoent __P((void));
+void           endservent __P((void));
+struct hostent *gethostbyaddr __P((const void *, int, int));
+struct hostent *gethostbyname __P((const char *));
+/* struct hostent *gethostent __P((void)); */
+struct netent  *getnetbyaddr __P((long, int)); /* u_long? */
+struct netent  *getnetbyname __P((const char *));
+struct netent  *getnetent __P((void));
+struct protoent        *getprotobyname __P((const char *));
+struct protoent        *getprotobynumber __P((int));
+struct protoent        *getprotoent __P((void));
+struct servent *getservbyname __P((const char *, const char *));
+struct servent *getservbyport __P((int, const char *));
+struct servent *getservent __P((void));
+void           herror __P((const char *));
+void           sethostent __P((int));
+/* void                sethostfile __P((const char *)); */
+void           setnetent __P((int));
+void           setprotoent __P((int));
+void           setservent __P((int));
+__END_DECLS

diff --git a/usr/src/include/stdlib.h b/usr/src/include/stdlib.h
index 17f259d..51681ca 100644 (file)
--- a/usr/src/include/stdlib.h
+++ b/usr/src/include/stdlib.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)stdlib.h    5.7 (Berkeley) %G%
+ *     @(#)stdlib.h    5.8 (Berkeley) %G%

  */
 
 #ifndef _STDLIB_H_
  */
 
 #ifndef _STDLIB_H_


@@ -43,45 +43,54 @@ __BEGIN_DECLS
 void    abort __P((void));
 int     abs __P((int));
 int     atexit __P((void (*)(void)));
 void    abort __P((void));
 int     abs __P((int));
 int     atexit __P((void (*)(void)));

-double  atof __P((const char *_nptr));
-int     atoi __P((const char *_nptr));
-long    atol __P((const char *_nptr));
-void   *bsearch __P((const void *_key, const void *_base, size_t _nmemb,
-           size_t _size, int (*_compar)(const void *, const void *)));
-void   *calloc __P((size_t _nmemb, size_t _size));
-div_t   div __P((int _numer, int _denom));
-void    exit __P((int _status));
-void    free __P((void *_ptr));
-char   *getenv __P((const char *_string));
+double  atof __P((const char *));
+int     atoi __P((const char *));
+long    atol __P((const char *));
+void   *bsearch __P((const void *, const void *, size_t,
+           size_t, int (*)(const void *, const void *)));
+void   *calloc __P((size_t, size_t));
+div_t   div __P((int, int));
+void    exit __P((int));
+void    free __P((void *));
+char   *getenv __P((const char *));

 long    labs __P((long));
 long    labs __P((long));

-ldiv_t  ldiv __P((long _numer, long _denom));
-void   *malloc __P((size_t _size));
-void    qsort __P((void *_base, size_t _nmemb, size_t _size,
-           int (*_compar)(const void *, const void *)));
+ldiv_t  ldiv __P((long, long));
+void   *malloc __P((size_t));
+void    qsort __P((void *, size_t, size_t,
+           int (*)(const void *, const void *)));

 int     rand __P((void));
 int     rand __P((void));

-void   *realloc __P((void *_ptr, size_t _size));
-void    srand __P((unsigned _seed));
-long    strtol __P((const char *_nptr, char **_endptr, int _base));
+void   *realloc __P((void *, size_t));
+void    srand __P((unsigned));
+double  strtod __P((const char *, char **));
+long    strtol __P((const char *, char **, int));

 unsigned long
 unsigned long

-        strtoul __P((const char *_nptr, char **_endptr, int _base));
-int     system __P((const char *_string));
+        strtoul __P((const char *, char **, int));
+int     system __P((const char *));

 
 /* these are currently just stubs */
 
 /* these are currently just stubs */

-int    mblen __P((const char *_s, size_t _n));
-size_t mbstowcs __P((wchar_t *_pwcs, const char *_s, size_t _n));
-int    wctomb __P((char *_s, wchar_t _wchar));
-int    mbtowc __P((wchar_t *_pwc, const char *_s, size_t _n));
-size_t wcstombs __P((char *_s, const wchar_t *_pwcs, size_t _n));
+int     mblen __P((const char *, size_t));
+size_t  mbstowcs __P((wchar_t *, const char *, size_t));
+int     wctomb __P((char *, wchar_t));
+int     mbtowc __P((wchar_t *, const char *, size_t));
+size_t  wcstombs __P((char *, const wchar_t *, size_t));

 
 #ifndef _ANSI_SOURCE
 
 #ifndef _ANSI_SOURCE

-void    cfree __P((void *_ptr));
-int    putenv __P((const char *_string));
-int    setenv __P((const char *_string, const char *_value, int _overwrite));
-#endif
+void    cfree __P((void *));
+int     putenv __P((const char *));
+int     setenv __P((const char *, const char *, int));
+#endif /* not ANSI */
+
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+void   *alloca __P((size_t));  /* built-in for gcc */
+int     getopt __P((int, const char * const *, const char *));
+char   *initstate __P((unsigned, char *, int));
+int     radixsort __P((const u_char **, int, const u_char *, u_char));
+long    random __P((void));
+char   *setstate __P((char *));
+void    srandom __P((unsigned));
+void    unsetenv __P((const char *));
+#endif /* neither ANSI nor POSIX */

 
 

-#ifdef NOT_YET_IMPLEMENTED
-double strtod __P((const char *_nptr, char **_endptr));
-#endif

 __END_DECLS
 
 #endif /* _STDLIB_H_ */
 __END_DECLS
 
 #endif /* _STDLIB_H_ */

diff --git a/usr/src/include/time.h b/usr/src/include/time.h
index 90843c3..80df9a6 100644 (file)
--- a/usr/src/include/time.h
+++ b/usr/src/include/time.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)time.h      5.9 (Berkeley) %G%
+ *     @(#)time.h      5.10 (Berkeley) %G%

  */
 
 #ifndef _TIME_H_
  */
 
 #ifndef _TIME_H_


@@ -48,17 +48,24 @@ struct tm {
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS
 #include <sys/cdefs.h>
 
 __BEGIN_DECLS

+char *asctime __P((const struct tm *));
+clock_t clock __P((void));
+char *ctime __P((const time_t *));
+double difftime __P((const time_t, const time_t));

 struct tm *gmtime __P((const time_t *));
 struct tm *localtime __P((const time_t *));
 time_t mktime __P((const struct tm *));
 struct tm *gmtime __P((const time_t *));
 struct tm *localtime __P((const time_t *));
 time_t mktime __P((const struct tm *));

+size_t strftime __P((char *, size_t, const char *, const struct tm *));

 time_t time __P((time_t *));
 time_t time __P((time_t *));

-clock_t clock __P((void));
-double difftime __P((const time_t, const time_t));
-char *asctime __P((const struct tm *));
-char *ctime __P((const time_t *));
-char *timezone __P((int , int));
+
+#ifndef _ANSI_SOURCE

 void tzset __P((void));
 void tzset __P((void));

+#endif /* not ANSI */
+
+#if !defined(_ANSI_SOURCE) && !defined(_POSIX_SOURCE)
+char *timezone __P((int, int));

 void tzsetwall __P((void));
 void tzsetwall __P((void));

+#endif /* neither ANSI nor POSIX */

 __END_DECLS
 
 #endif /* !_TIME_H_ */
 __END_DECLS
 
 #endif /* !_TIME_H_ */

diff --git a/usr/src/include/vis.h b/usr/src/include/vis.h
index 9d8b5d4..be39b59 100644 (file)
--- a/usr/src/include/vis.h
+++ b/usr/src/include/vis.h
@@ -4,7 +4,7 @@
  *
  * %sccs.include.redist.c%
  *
  *
  * %sccs.include.redist.c%
  *

- *     @(#)vis.h       5.5 (Berkeley) %G%
+ *     @(#)vis.h       5.6 (Berkeley) %G%

  */
 
 /*
  */
 
 /*


@@ -48,4 +48,6 @@ __BEGIN_DECLS
 char   *vis __P((char *, char, char, int));
 int    strvis __P((char *, const char *, int));
 int    strvisx __P((char *, const char *, size_t, int));
 char   *vis __P((char *, char, char, int));
 int    strvis __P((char *, const char *, int));
 int    strvisx __P((char *, const char *, size_t, int));

+int    strunvis __P((char *, const char *));
+int    unvis __P((u_char *, u_char, int *, int));

 __END_DECLS
 __END_DECLS