[Pkg-voip-commits] r1939 - siproxd/trunk/debian/patches

[Mark Purcell]

Author: msp
Date: 2006-06-21 15:11:36 +0000 (Wed, 21 Jun 2006)
New Revision: 1939

Modified:
   siproxd/trunk/debian/patches/openlogger-2.diff
Log:
Cleanup openlogger-2.diff

Modified: siproxd/trunk/debian/patches/openlogger-2.diff
===================================================================
--- siproxd/trunk/debian/patches/openlogger-2.diff	2006-06-21 14:55:30 UTC (rev 1938)
+++ siproxd/trunk/debian/patches/openlogger-2.diff	2006-06-21 15:11:36 UTC (rev 1939)
@@ -1,29 +1,36 @@
-Index: siproxd-0.5.10/src/log.c
-===================================================================
---- siproxd-0.5.10.orig/src/log.c	2005-01-08 05:41:46.000000000 -0500
-+++ siproxd-0.5.10/src/log.c	2005-03-19 10:15:16.512847656 -0500
-@@ -235,7 +235,7 @@
-    } else if (silence_level < 1) {
-       /* running as daemon - log via SYSLOG facility */
-       vsnprintf(string, sizeof(string), format, ap);
+--- siproxd-0.5.13/src/log.c.orig	2006-06-18 17:28:43.000000000 +0100
++++ siproxd-0.5.13/src/log.c	2006-06-21 16:04:40.000000000 +0100
+@@ -239,7 +239,7 @@
+       va_copy(ap_copy, ap);
+       vsnprintf(string, sizeof(string), format, ap_copy);
+       va_end(ap_copy);
 -      syslog(LOG_USER|LOG_DEBUG, "%s:%i %s", file, line, string);
 +      syslog(LOG_DAEMON|LOG_DEBUG, "%s:%i %s", file, line, string);
     }
     /*
      * Log to TCP
-@@ -337,7 +337,7 @@
-    if (silence_level < 3) {
-       /* running as daemon - log via SYSLOG facility */
-       vsnprintf(string, sizeof(string), format, ap);
+@@ -296,7 +296,7 @@
+       va_copy(ap_copy, ap);
+       vsnprintf(string, sizeof(string), format, ap_copy);
+       va_end(ap_copy);
+-      syslog(LOG_USER|LOG_WARNING, "%s:%i ERROR:%s", file, line, string);
++      syslog(LOG_DAEMON|LOG_WARNING, "%s:%i ERROR:%s", file, line, string);
+    }
+    /*
+     * Log to TCP
+@@ -353,7 +353,7 @@
+       va_copy(ap_copy, ap);
+       vsnprintf(string, sizeof(string), format, ap_copy);
+       va_end(ap_copy);
 -      syslog(LOG_USER|LOG_NOTICE, "%s:%i WARNING:%s", file, line, string);
 +      syslog(LOG_DAEMON|LOG_NOTICE, "%s:%i WARNING:%s", file, line, string);
     }
     /*
      * Log to TCP
-@@ -388,7 +388,7 @@
-    if (silence_level < 2) {
-       /* running as daemon - log via SYSLOG facility */
-       vsnprintf(string, sizeof(string), format, ap);
+@@ -410,7 +410,7 @@
+       va_copy(ap_copy, ap);
+       vsnprintf(string, sizeof(string), format, ap_copy);
+       va_end(ap_copy);
 -      syslog(LOG_USER|LOG_NOTICE, "%s:%i INFO:%s", file, line, string);
 +      syslog(LOG_DAEMON|LOG_NOTICE, "%s:%i INFO:%s", file, line, string);
     }