[PVFS2-CVS] commit by robl in pvfs2-1/src/common/gossip: gossip.c

[CVS commit program]

Update of /projects/cvsroot/pvfs2-1/src/common/gossip
In directory parlweb:/tmp/cvs-serv10104/src/common/gossip

Modified Files:
	gossip.c 
Log Message:
[pcarns]: prefix log messages with 'D' (debug) or 'E' (error) to indicate
severity


Index: gossip.c
===================================================================
RCS file: /projects/cvsroot/pvfs2-1/src/common/gossip/gossip.c,v
diff -u -w -p -u -r1.15 -r1.16
--- gossip.c	4 Mar 2005 16:50:11 -0000	1.15
+++ gossip.c	2 Aug 2005 16:25:35 -0000	1.16
@@ -64,9 +64,10 @@ static enum gossip_logstamp internal_log
 static int gossip_disable_stderr(void);
 static int gossip_disable_file(void);
 
-static int gossip_debug_fp(FILE *fp, const char *format, va_list ap, enum
+static int gossip_debug_fp(FILE *fp, const char prefix, const char *format, va_list ap, enum
 gossip_logstamp ts);
 static int gossip_debug_syslog(
+    const char prefix,
     const char *format,
     va_list ap);
 static int gossip_err_syslog(
@@ -291,13 +292,13 @@ int __gossip_debug(
     switch (gossip_facility)
     {
     case GOSSIP_STDERR:
-        ret = gossip_debug_fp(stderr, format, ap, internal_logstamp);
+        ret = gossip_debug_fp(stderr, 'D', format, ap, internal_logstamp);
         break;
     case GOSSIP_FILE:
-        ret = gossip_debug_fp(internal_log_file, format, ap, internal_logstamp);
+        ret = gossip_debug_fp(internal_log_file, 'D', format, ap, internal_logstamp);
         break;
     case GOSSIP_SYSLOG:
-        ret = gossip_debug_syslog(format, ap);
+        ret = gossip_debug_syslog('D', format, ap);
         break;
     default:
         break;
@@ -332,10 +333,10 @@ int gossip_err(
     switch (gossip_facility)
     {
     case GOSSIP_STDERR:
-        ret = gossip_debug_fp(stderr, format, ap, internal_logstamp);
+        ret = gossip_debug_fp(stderr, 'E', format, ap, internal_logstamp);
         break;
     case GOSSIP_FILE:
-        ret = gossip_debug_fp(internal_log_file, format, ap, internal_logstamp);
+        ret = gossip_debug_fp(internal_log_file, 'E', format, ap, internal_logstamp);
         break;
     case GOSSIP_SYSLOG:
         ret = gossip_err_syslog(format, ap);
@@ -384,13 +385,20 @@ void gossip_backtrace(void)
  * returns 0 on success, -errno on failure
  */
 static int gossip_debug_syslog(
+    const char prefix,
     const char *format,
     va_list ap)
 {
     char buffer[GOSSIP_BUF_SIZE];
+    char *bptr = buffer;
+    int bsize = sizeof(buffer);
     int ret = -EINVAL;
 
-    ret = vsnprintf(buffer, GOSSIP_BUF_SIZE, format, ap);
+    sprintf(bptr, "[%c] ", prefix);
+    bptr += 4;
+    bsize -= 4;
+
+    ret = vsnprintf(bptr, bsize, format, ap);
     if (ret < 0)
     {
         return -errno;
@@ -408,8 +416,8 @@ static int gossip_debug_syslog(
  *
  * returns 0 on success, -errno on failure
  */
-static int gossip_debug_fp(FILE *fp, const char *format, va_list ap, enum
-gossip_logstamp ts)
+static int gossip_debug_fp(FILE *fp, const char prefix, 
+    const char *format, va_list ap, enum gossip_logstamp ts)
 {
     char buffer[GOSSIP_BUF_SIZE], *bptr = buffer;
     int bsize = sizeof(buffer);
@@ -417,24 +425,32 @@ gossip_logstamp ts)
     struct timeval tv;
     time_t tp;
 
+    sprintf(bptr, "[%c ", prefix);
+    bptr += 3;
+    bsize -= 3;
+
     switch(ts)
     {
         case GOSSIP_LOGSTAMP_USEC:
             gettimeofday(&tv, 0);
             tp = tv.tv_sec;
-            strftime(bptr, 10, "[%H:%M:%S", localtime(&tp));
-            sprintf(bptr+9, ".%06ld] ", tv.tv_usec);
-            bptr += 18;
-            bsize -= 18;
+            strftime(bptr, 9, "%H:%M:%S", localtime(&tp));
+            sprintf(bptr+8, ".%06ld] ", tv.tv_usec);
+            bptr += 17;
+            bsize -= 17;
             break;
         case GOSSIP_LOGSTAMP_DATETIME:
             gettimeofday(&tv, 0);
             tp = tv.tv_sec;
-            strftime(bptr, 15, "[%m/%d %H:%M] ", localtime(&tp));
-            bptr += 14;
-            bsize -= 14;
+            strftime(bptr, 14, "%m/%d %H:%M] ", localtime(&tp));
+            bptr += 13;
+            bsize -= 13;
             break;
         case GOSSIP_LOGSTAMP_NONE:
+            bptr--;
+            sprintf(bptr, "] ");
+            bptr += 2;
+            bsize++;
             break;
         default:
             break;
@@ -472,7 +488,7 @@ static int gossip_err_syslog(
     int tmp_priority = internal_syslog_priority;
     internal_syslog_priority = LOG_ERR;
 
-    gossip_debug_syslog(format, ap);
+    gossip_debug_syslog('E', format, ap);
 
     internal_syslog_priority = tmp_priority;