const poison just like NetBSD.

This commit is contained in:
Warner Losh 2002-03-22 02:43:01 +00:00
parent ae10a3fcce
commit 80578e902c
2 changed files with 21 additions and 39 deletions

View File

@ -152,16 +152,16 @@ long long
atoll __P((const char *)); atoll __P((const char *));
#endif #endif
char *getbsize __P((int *, long *)); char *getbsize __P((int *, long *));
char *cgetcap __P((char *, char *, int)); char *cgetcap __P((char *, const char *, int));
int cgetclose __P((void)); int cgetclose __P((void));
int cgetent __P((char **, char **, char *)); int cgetent __P((char **, char **, const char *));
int cgetfirst __P((char **, char **)); int cgetfirst __P((char **, char **));
int cgetmatch __P((char *, char *)); int cgetmatch __P((const char *, const char *));
int cgetnext __P((char **, char **)); int cgetnext __P((char **, char **));
int cgetnum __P((char *, char *, long *)); int cgetnum __P((char *, const char *, long *));
int cgetset __P((char *)); int cgetset __P((const char *));
int cgetstr __P((char *, char *, char **)); int cgetstr __P((char *, const char *, char **));
int cgetustr __P((char *, char *, char **)); int cgetustr __P((char *, const char *, char **));
int daemon __P((int, int)); int daemon __P((int, int));
char *devname __P((int, int)); char *devname __P((int, int));

View File

@ -79,8 +79,7 @@ static int nfcmp(char *, char *);
* virtual database. 0 is returned on success, -1 on failure. * virtual database. 0 is returned on success, -1 on failure.
*/ */
int int
cgetset(ent) cgetset(const char *ent)
char *ent;
{ {
if (ent == NULL) { if (ent == NULL) {
if (toprec) if (toprec)
@ -112,9 +111,7 @@ cgetset(ent)
* return NULL. * return NULL.
*/ */
char * char *
cgetcap(buf, cap, type) cgetcap(char *buf, const char *cap, int type)
char *buf, *cap;
int type;
{ {
char *bp, *cp; char *bp, *cp;
@ -164,8 +161,7 @@ cgetcap(buf, cap, type)
* reference loop is detected. * reference loop is detected.
*/ */
int int
cgetent(buf, db_array, name) cgetent(char **buf, char **db_array, const char *name)
char **buf, **db_array, *name;
{ {
u_int dummy; u_int dummy;
@ -191,10 +187,8 @@ cgetent(buf, db_array, name)
* MAX_RECURSION. * MAX_RECURSION.
*/ */
static int static int
getent(cap, len, db_array, fd, name, depth, nfield) getent(char **cap, u_int *len, char **db_array, int fd, char *name, int depth,
char **cap, **db_array, *name, *nfield; char *nfield)
u_int *len;
int fd, depth;
{ {
DB *capdbp; DB *capdbp;
char *r_end, *rp, **db_p; char *r_end, *rp, **db_p;
@ -538,9 +532,7 @@ tc_exp: {
} }
static int static int
cdbget(capdbp, bp, name) cdbget(DB *capdbp, char **bp, char *name)
DB *capdbp;
char **bp, *name;
{ {
DBT key, data; DBT key, data;
@ -573,8 +565,7 @@ cdbget(capdbp, bp, name)
* record buf, -1 if not. * record buf, -1 if not.
*/ */
int int
cgetmatch(buf, name) cgetmatch(const char *buf, const char *name)
char *buf, *name;
{ {
char *np, *bp; char *np, *bp;
@ -615,8 +606,7 @@ cgetmatch(buf, name)
int int
cgetfirst(buf, db_array) cgetfirst(char **buf, char **db_array)
char **buf, **db_array;
{ {
(void)cgetclose(); (void)cgetclose();
return (cgetnext(buf, db_array)); return (cgetnext(buf, db_array));
@ -627,7 +617,7 @@ static int slash;
static char **dbp; static char **dbp;
int int
cgetclose() cgetclose(void)
{ {
if (pfp != NULL) { if (pfp != NULL) {
(void)fclose(pfp); (void)fclose(pfp);
@ -645,9 +635,7 @@ cgetclose()
* upon returning an entry with more remaining, and -1 if an error occurs. * upon returning an entry with more remaining, and -1 if an error occurs.
*/ */
int int
cgetnext(bp, db_array) cgetnext(char **bp, char **db_array)
char **bp;
char **db_array;
{ {
size_t len; size_t len;
int done, hadreaderr, i, savederrno, status; int done, hadreaderr, i, savederrno, status;
@ -785,9 +773,7 @@ cgetnext(bp, db_array)
* allocation failure). * allocation failure).
*/ */
int int
cgetstr(buf, cap, str) cgetstr(char *buf, const char *cap, char **str)
char *buf, *cap;
char **str;
{ {
u_int m_room; u_int m_room;
char *bp, *mp; char *bp, *mp;
@ -914,8 +900,7 @@ cgetstr(buf, cap, str)
* error was encountered (storage allocation failure). * error was encountered (storage allocation failure).
*/ */
int int
cgetustr(buf, cap, str) cgetustr(char *buf, const char *cap, char **str)
char *buf, *cap, **str;
{ {
u_int m_room; u_int m_room;
char *bp, *mp; char *bp, *mp;
@ -983,9 +968,7 @@ cgetustr(buf, cap, str)
* numeric capability couldn't be found. * numeric capability couldn't be found.
*/ */
int int
cgetnum(buf, cap, num) cgetnum(char *buf, const char *cap, long *num)
char *buf, *cap;
long *num;
{ {
long n; long n;
int base, digit; int base, digit;
@ -1047,8 +1030,7 @@ cgetnum(buf, cap, num)
* Compare name field of record. * Compare name field of record.
*/ */
static int static int
nfcmp(nf, rec) nfcmp(char *nf, char *rec)
char *nf, *rec;
{ {
char *cp, tmp; char *cp, tmp;
int ret; int ret;