aboutsummaryrefslogtreecommitdiff
path: root/misc/getusershell.c
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2000-11-28 07:40:13 +0000
committerUlrich Drepper <drepper@redhat.com>2000-11-28 07:40:13 +0000
commit49f3a758597f7904ba7e779156df8f9b61c06303 (patch)
treee1f09e4f949ff0a76acba7fbbeb3192e5311d2c8 /misc/getusershell.c
parent8c0b7170956ed028472b4c1ef1d94608101da565 (diff)
downloadglibc-49f3a758597f7904ba7e779156df8f9b61c06303.tar
glibc-49f3a758597f7904ba7e779156df8f9b61c06303.tar.gz
glibc-49f3a758597f7904ba7e779156df8f9b61c06303.tar.bz2
glibc-49f3a758597f7904ba7e779156df8f9b61c06303.zip
Update.
* misc/getusershell.c: Make strings in okshells array const. * misc/regexp.c: Add const to cast to avoid warnings. * sysdeps/unix/sysv/linux/llseek.c: Add prototype for __llseek. * sysdeps/unix/sysv/linux/i386/setresuid.c: Add prototype for __setresuid. * sysdeps/unix/sysv/linux/i386/setresgid.c: Add prototype for setresgid. * misc/error.c: Add prototypes for __error and __error_at_line. * misc/mntent_r.c (__getmntent_r): Add break at end of switch statement to avoid warning.
Diffstat (limited to 'misc/getusershell.c')
-rw-r--r--misc/getusershell.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/misc/getusershell.c b/misc/getusershell.c
index 9e22125133..5ac08ce7f8 100644
--- a/misc/getusershell.c
+++ b/misc/getusershell.c
@@ -45,8 +45,7 @@ static char sccsid[] = "@(#)getusershell.c 8.1 (Berkeley) 6/4/93";
* /etc/shells.
*/
-static char *okshells[] = { (char *) _PATH_BSHELL, (char *) _PATH_CSHELL,
- NULL };
+static const char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
static char **curshell, **shells, *strings;
static char **initshells __P((void));
@@ -101,21 +100,21 @@ initshells()
free(strings);
strings = NULL;
if ((fp = fopen(_PATH_SHELLS, "r")) == NULL)
- return (okshells);
+ return (char **) okshells;
if (fstat64(fileno(fp), &statb) == -1) {
(void)fclose(fp);
- return (okshells);
+ return (char **) okshells;
}
if ((strings = malloc((u_int)statb.st_size + 1)) == NULL) {
(void)fclose(fp);
- return (okshells);
+ return (char **) okshells;
}
shells = calloc((unsigned)statb.st_size / 3, sizeof (char *));
if (shells == NULL) {
(void)fclose(fp);
free(strings);
strings = NULL;
- return (okshells);
+ return (char **) okshells;
}
sp = shells;
cp = strings;