[Msyslog-cvs] syslog/src/modules om_classic.c,1.98,1.99 om_tcp.c,1.31,1.32 om_udp.c,1.9,1.10

[<al...@us...>]

Update of /cvsroot/msyslog/syslog/src/modules
In directory sc8-pr-cvs1:/tmp/cvs-serv1063/src/modules

Modified Files:
	om_classic.c om_tcp.c om_udp.c 
Log Message:
fix typo, use msg not ctx


Index: om_classic.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_classic.c,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- om_classic.c	16 Jun 2003 19:18:40 -0000	1.98
+++ om_classic.c	17 Jun 2003 16:35:12 -0000	1.99
@@ -126,7 +126,7 @@
 	struct iovec *v;
 	struct om_classic_ctx *c;
 	int l;
-	char line[MAXLINE + 1], greetings[500], time_buf[16];
+	char line[MAXLINE + 1], greetings[500];
 	time_t now;
 
 	INCREASE_SENT(m);
@@ -149,9 +149,8 @@
 
 	} else {
 
-		strftime(time_buf, sizeof(time_buf), "%b %e %H:%M:%S", &m->tm);
-		v->iov_base = time_buf;
-		v->iov_len = 15;
+		v->iov_base = m->date;
+		v->iov_len = STD_DATE_LEN - 1;
 		v++;
 		v->iov_base = " ";
 		v->iov_len = 1;

Index: om_tcp.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_tcp.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- om_tcp.c	16 Jun 2003 19:18:40 -0000	1.31
+++ om_tcp.c	17 Jun 2003 16:35:12 -0000	1.32
@@ -190,7 +190,6 @@
 {
 	struct om_tcp_ctx *c;
 	RETSIGTYPE (*sigsave)(int);
-	char time_buf[16];
 	char line[MAXLINE + 1];
 	int l;
 
@@ -198,19 +197,17 @@
 
 	c = (struct om_tcp_ctx *) ctx;
 
-	strftime(time_buf, sizeof(time_buf), "%b %e %H:%M:%S", &m->tm);
-
 	/* we give a newline termination to difference lines, unlike UDP */
 
   if (c->flags & M_ADDHOST) {
     l = snprintf(line, sizeof(line), "<%d>%.15s %s %s\n",
-        LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), time_buf,
+        LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), m->date,
 	m->host, m->msg);
 
   } else {
 
     l = snprintf(line, sizeof(line), "<%d>%.15s %s\n",
-        LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), time_buf,
+        LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]), m->date,
         m->msg);
 
   }

Index: om_udp.c
===================================================================
RCS file: /cvsroot/msyslog/syslog/src/modules/om_udp.c,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- om_udp.c	16 Jun 2003 19:18:40 -0000	1.9
+++ om_udp.c	17 Jun 2003 16:35:12 -0000	1.10
@@ -171,7 +171,6 @@
 om_udp_write(filed_t *f, m_msg_t *m, void *ctx)
 {
 	struct om_udp_ctx *c;
-	char time_buf[16];
 	char line[MAXLINE + 1];
 	int l;
 
@@ -184,18 +183,16 @@
 
 	c = (struct om_udp_ctx *) ctx;
 
-	strftime(time_buf, sizeof(time_buf), "%b %e %H:%M:%S", &m->tm);
-
 	/* we give a newline termination to difference lines */
 
 	if (c->flags & M_ADDHOST) {
 		l = snprintf(line, sizeof(line), "<%d>%.15s %s %s\n",
 		    LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]),
-		    time_buf, m->host, m->msg);
+		    m->date, m->host, m->msg);
 	} else {
 		l = snprintf(line, sizeof(line), "<%d>%.15s %s\n",
 		    LOG_MAKEPRI(m->vals[M_VAL_FAC], m->vals[M_VAL_PRI]),
-		    time_buf, m->msg);
+		    m->date, m->msg);
 	}
 
 	m_dprintf(MSYSLOG_INFORMATIVE, "om_udp_write: sending to %s:%s, %s",