svn commit: trunk/uClibc/libc/misc/syslog
aldot at uclibc.org
aldot at uclibc.org
Fri May 30 08:58:48 UTC 2008
Author: aldot
Date: 2008-05-30 01:58:47 -0700 (Fri, 30 May 2008)
New Revision: 22113
Log:
- shrink a little bit.
text data bss dec hex filename
1176 16 24 1216 4c0 libc/misc/syslog/syslog.o.orig
1140 16 21 1177 499 libc/misc/syslog/syslog.o
Modified:
trunk/uClibc/libc/misc/syslog/syslog.c
Changeset:
Modified: trunk/uClibc/libc/misc/syslog/syslog.c
===================================================================
--- trunk/uClibc/libc/misc/syslog/syslog.c 2008-05-29 22:19:01 UTC (rev 22112)
+++ trunk/uClibc/libc/misc/syslog/syslog.c 2008-05-30 08:58:47 UTC (rev 22113)
@@ -109,7 +109,7 @@
static int LogFile = -1; /* fd for log */
-static int connected; /* have done connect */
+static smalluint connected; /* have done connect */
static int LogStat = 0; /* status bits, set by openlog() */
static const char *LogTag = "syslog"; /* string to tag the entry with */
static int LogFacility = LOG_USER; /* default facility code */
@@ -117,7 +117,7 @@
static struct sockaddr SyslogAddr; /* AF_UNIX address of local logger */
static void
-closelog_intern(int to_default)
+closelog_intern(const smalluint to_default)
{
__UCLIBC_MUTEX_LOCK(mylock);
if (LogFile != -1) {
@@ -174,18 +174,15 @@
sizeof(SyslogAddr.sa_data) + strlen(SyslogAddr.sa_data)) != -1)
{
connected = 1;
- } else if (logType == SOCK_DGRAM) {
- logType = SOCK_STREAM;
- if (LogFile != -1) {
- close(LogFile);
- LogFile = -1;
- }
- goto retry;
} else {
if (LogFile != -1) {
close(LogFile);
LogFile = -1;
}
+ if (logType == SOCK_DGRAM) {
+ logType = SOCK_STREAM;
+ goto retry;
+ }
}
}
@@ -206,10 +203,10 @@
time_t now;
int fd, saved_errno;
int rc;
- char tbuf[1024]; /* syslogd is unable to handle longer messages */
-
+ char tbuf[1024]; /* syslogd is unable to handle longer messages */
struct sigaction action, oldaction;
int sigpipe;
+
memset (&action, 0, sizeof (action));
action.sa_handler = sigpipe_handler;
sigemptyset (&action.sa_mask);
@@ -316,8 +313,7 @@
getout:
__UCLIBC_MUTEX_UNLOCK(mylock);
if (sigpipe == 0)
- sigaction (SIGPIPE, &oldaction,
- (struct sigaction *) NULL);
+ sigaction (SIGPIPE, &oldaction, (struct sigaction *) NULL);
}
libc_hidden_def(vsyslog)
@@ -350,7 +346,7 @@
omask = LogMask;
__UCLIBC_MUTEX_LOCK(mylock);
if (pmask != 0)
- LogMask = pmask;
+ LogMask = pmask;
__UCLIBC_MUTEX_UNLOCK(mylock);
return (omask);
}
More information about the uClibc-cvs
mailing list