d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Silence casting away constness warnings.

Browse Source 
Make cgetmatch's locals const.
Make cdbget take a const string and copy it into a buffer.
This commit is contained in:
alfred 2002-12-27 08:43:40 +00:00
parent 8c99fb48c7
commit 2078a4c774
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/libc/gen/getcap.c
View File

@ -69,7 +69,7 @@ static size_t topreclen; /* toprec length */
static char *toprec; /* Additional record specified by cgetset() */
static int gottoprec; /* Flag indicating retrieval of toprecord */
static int cdbget(DB *, char **, char *);
static int cdbget(DB *, char **, const char *);
static int getent(char **, u_int *, char **, int, const char *, int, char *);
static int nfcmp(char *, char *);
@ -533,19 +533,25 @@ tc_exp: {
}
static int
cdbget(DB *capdbp, char **bp, char *name)
cdbget(DB *capdbp, char **bp, const char *name)
{
DBT key, data;
char *namebuf;
key.data = name;
key.size = strlen(name);
namebuf = strdup(name);
if (namebuf == NULL)
return (-2);
key.data = namebuf;
key.size = strlen(namebuf);
for (;;) {
/* Get the reference. */
switch(capdbp->get(capdbp, &key, &data, 0)) {
case -1:
free(namebuf);
return (-2);
case 1:
free(namebuf);
return (-1);
}
@ -558,6 +564,7 @@ cdbget(DB *capdbp, char **bp, char *name)
}
*bp = (char *)data.data + 1;
free(namebuf);
return (((char *)(data.data))[0] == TCERR ? 1 : 0);
}
@ -568,7 +575,7 @@ cdbget(DB *capdbp, char **bp, char *name)
int
cgetmatch(const char *buf, const char *name)
{
char *np, *bp;
const char *np, *bp;
/*
* Start search at beginning of record.