diff options
author | peter <peter@FreeBSD.org> | 2003-10-26 03:51:47 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 2003-10-26 03:51:47 +0000 |
commit | 79a9b01a78a1dda298745096596faded78c542a9 (patch) | |
tree | e1559e640f427a56308fcdcfac8c4c3a37b7f6c7 /lib/libutil | |
parent | eaeee19e67cfe571826764870b55f0b4c8d52c1d (diff) | |
download | FreeBSD-src-79a9b01a78a1dda298745096596faded78c542a9.zip FreeBSD-src-79a9b01a78a1dda298745096596faded78c542a9.tar.gz |
(mostly) Clean up some const warnings here. The code takes some liberties
because it is the originator of various const strings and knows that they
came from malloc.
Diffstat (limited to 'lib/libutil')
-rw-r--r-- | lib/libutil/login_cap.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/lib/libutil/login_cap.c b/lib/libutil/login_cap.c index 8347b51..ad1dacb 100644 --- a/lib/libutil/login_cap.c +++ b/lib/libutil/login_cap.c @@ -104,21 +104,22 @@ static const char ** arrayize(const char *str, const char *chars, int *size) { int i; - const char *ptr; + char *ptr; + const char *cptr; const char **res = NULL; /* count the sub-strings */ - for (i = 0, ptr = str; *ptr; i++) { - int count = strcspn(ptr, chars); - ptr += count; - if (*ptr) - ++ptr; + for (i = 0, cptr = str; *cptr; i++) { + int count = strcspn(cptr, chars); + cptr += count; + if (*cptr) + ++cptr; } /* alloc the array */ if ((ptr = allocstr(str)) != NULL) { if ((res = allocarray(++i)) == NULL) - free(str); + free((void *)(uintptr_t)(const void *)str); else { /* now split the string */ i = 0; @@ -191,7 +192,7 @@ login_getclassbyname(char const *name, const struct passwd *pwd) const char *dir; char userpath[MAXPATHLEN]; - static const char *login_dbarray[] = { NULL, NULL, NULL }; + static char *login_dbarray[] = { NULL, NULL, NULL }; me = (name != NULL && strcmp(name, LOGIN_MECLASS) == 0); dir = (!me || pwd == NULL) ? NULL : pwd->pw_dir; |