summaryrefslogtreecommitdiff
path: root/misc
diff options
context:
space:
mode:
authorJakub Jelinek <jakub@redhat.com>2005-12-21 09:35:28 +0000
committerJakub Jelinek <jakub@redhat.com>2005-12-21 09:35:28 +0000
commitbaa0a2c9a410a88fcacdf82abc7d21b0c99c7cd3 (patch)
tree23761bbdd386ee804a16e3483d30adb8bc204c3a /misc
parent2bf037b4e8e189e910a41744d79404b94235ab8b (diff)
downloadglibc-baa0a2c9a410a88fcacdf82abc7d21b0c99c7cd3.tar.gz
Updated to fedora-glibc-20051221T0931
Diffstat (limited to 'misc')
-rw-r--r--misc/getusershell.c16
-rw-r--r--misc/syslog.c2
2 files changed, 6 insertions, 12 deletions
diff --git a/misc/getusershell.c b/misc/getusershell.c
index 95f0eab5e2..f41c6fa5f0 100644
--- a/misc/getusershell.c
+++ b/misc/getusershell.c
@@ -46,7 +46,7 @@ static char sccsid[] = "@(#)getusershell.c 8.1 (Berkeley) 6/4/93";
* /etc/shells.
*/
-static const char *okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
+static const char *const okshells[] = { _PATH_BSHELL, _PATH_CSHELL, NULL };
static char **curshell, **shells, *strings;
static char **initshells (void) __THROW;
@@ -70,11 +70,9 @@ void
endusershell()
{
- if (shells != NULL)
- free(shells);
+ free(shells);
shells = NULL;
- if (strings != NULL)
- free(strings);
+ free(strings);
strings = NULL;
curshell = NULL;
}
@@ -94,11 +92,9 @@ initshells()
struct stat64 statb;
int flen;
- if (shells != NULL)
- free(shells);
+ free(shells);
shells = NULL;
- if (strings != NULL)
- free(strings);
+ free(strings);
strings = NULL;
if ((fp = fopen(_PATH_SHELLS, "rc")) == NULL)
return (char **) okshells;
@@ -117,8 +113,6 @@ initshells()
strings = NULL;
return (char **) okshells;
}
- /* No threads using this stream. */
- __fsetlocking (fp, FSETLOCKING_BYCALLER);
sp = shells;
cp = strings;
flen = statb.st_size;
diff --git a/misc/syslog.c b/misc/syslog.c
index 9c5597f5aa..cae13f876b 100644
--- a/misc/syslog.c
+++ b/misc/syslog.c
@@ -195,7 +195,7 @@ __vsyslog_chk(int pri, int flag, const char *fmt, va_list ap)
- f->_IO_write_ptr,
"%h %e %T ",
__localtime_r (&now, &now_tm),
- &_nl_C_locobj);
+ _nl_C_locobj_ptr);
msgoff = ftell (f);
if (LogTag == NULL)
LogTag = __progname;