svn commit: trunk/busybox/sysklogd

[vda at busybox.net]

Author: vda
Date: 2007-01-09 15:42:43 -0800 (Tue, 09 Jan 2007)
New Revision: 17212

Log:
small size reduction by Bernhard Fischer <rep.nop at aon.at>


Modified:
   trunk/busybox/sysklogd/syslogd.c


Changeset:
Modified: trunk/busybox/sysklogd/syslogd.c
===================================================================
--- trunk/busybox/sysklogd/syslogd.c	2007-01-09 23:39:48 UTC (rev 17211)
+++ trunk/busybox/sysklogd/syslogd.c	2007-01-09 23:42:43 UTC (rev 17212)
@@ -290,9 +290,6 @@
 			goto reopen;
 		}
 	} else {
-#if ENABLE_FEATURE_ROTATE_LOGFILE
-		struct stat statf;
-#endif
  reopen:
 		logFD = device_open(logFilePath, O_WRONLY | O_CREAT
 					| O_NOCTTY | O_APPEND | O_NONBLOCK);
@@ -307,9 +304,13 @@
 			return;
 		}
 #if ENABLE_FEATURE_ROTATE_LOGFILE
+		{
+		struct stat statf;
+
 		isRegular = (fstat(logFD, &statf) == 0 && (statf.st_mode & S_IFREG));
 		/* bug (mostly harmless): can wrap around if file > 4gb */
 		curFileSize = statf.st_size;
+		}
 #endif
 	}
 
@@ -381,12 +382,12 @@
  * that there is no timestamp, short-cutting the test. */
 static void timestamp_and_log(int pri, char *msg, int len)
 {
-	time_t now;
 	char *timestamp;
 
 	if (len < 16 || msg[3] != ' ' || msg[6] != ' '
 	 || msg[9] != ':' || msg[12] != ':' || msg[15] != ' '
 	) {
+		time_t now;
 		time(&now);
 		timestamp = ctime(&now) + 4;
 	} else {
@@ -494,9 +495,7 @@
 	strncpy(sunx.sun_path, dev_log_name, sizeof(sunx.sun_path));
 	sock_fd = xsocket(AF_UNIX, SOCK_DGRAM, 0);
 	addrLength = sizeof(sunx.sun_family) + strlen(sunx.sun_path);
-	if (bind(sock_fd, (struct sockaddr *) &sunx, addrLength) < 0) {
-		bb_perror_msg_and_die("cannot connect to socket %s", dev_log_name);
-	}
+	xbind(sock_fd, (struct sockaddr *) &sunx, addrLength);
 
 	if (chmod(dev_log_name, 0666) < 0) {
 		bb_perror_msg_and_die("cannot set permission on %s", dev_log_name);