[dovecot-cvs] dovecot-lda/src/libsieve bc_emit.c, 1.3, 1.4 script.c, 1.4, 1.5 sievec.c, 1.2, 1.3

[cras at dovecot.org]

Update of /var/lib/cvs/dovecot-lda/src/libsieve
In directory talvi:/tmp/cvs-serv31394/libsieve

Modified Files:
	bc_emit.c script.c sievec.c 
Log Message:
Replaced syslog() calls with Dovecot's i_info/i_error calls



Index: bc_emit.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/libsieve/bc_emit.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- bc_emit.c	13 Apr 2006 19:47:14 -0000	1.3
+++ bc_emit.c	12 May 2006 18:42:29 -0000	1.4
@@ -36,7 +36,6 @@
  
 #include "bytecode.h"
 
-#include <syslog.h>
 #include <sys/types.h>
 #include <unistd.h>
 

Index: script.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/libsieve/script.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- script.c	15 Oct 2005 13:31:26 -0000	1.4
+++ script.c	12 May 2006 18:42:29 -0000	1.5
@@ -32,7 +32,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <ctype.h>
-#include <syslog.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>

Index: sievec.c
===================================================================
RCS file: /var/lib/cvs/dovecot-lda/src/libsieve/sievec.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- sievec.c	12 May 2006 18:41:26 -0000	1.2
+++ sievec.c	12 May 2006 18:42:29 -0000	1.3
@@ -48,7 +48,6 @@
 #endif
 
 #include "sieve_interface.h"
-#include <syslog.h>
 
 #include "libconfig.h"
 #include "xmalloc.h"
@@ -161,7 +160,7 @@
 
     snprintf(buf, 80, "line %d: %s\r\n", lineno, msg);
     *errstr = xrealloc(*errstr, strlen(*errstr) + strlen(buf) + 30);
-    syslog(LOG_DEBUG, "%s", buf);
+    i_info("%s", buf);
     strcat(*errstr, buf);
 
     return SIEVE_OK;
@@ -178,75 +177,75 @@
   
     res = sieve_interp_alloc(&i, NULL);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_interp_alloc() returns %d\n", res);
+	i_error("sieve_interp_alloc() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
 
     res = sieve_register_redirect(i, (sieve_callback *) &foo);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_redirect() returns %d\n", res);
+	i_error("sieve_register_redirect() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
     res = sieve_register_discard(i, (sieve_callback *) &foo);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_discard() returns %d\n", res);
+	i_error("sieve_register_discard() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
     res = sieve_register_reject(i, (sieve_callback *) &foo);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_reject() returns %d\n", res);
+	i_error("sieve_register_reject() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
     res = sieve_register_fileinto(i, (sieve_callback *) &foo);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_fileinto() returns %d\n", res);
+	i_error("sieve_register_fileinto() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
     res = sieve_register_keep(i, (sieve_callback *) &foo);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_keep() returns %d\n", res);
+	i_error("sieve_register_keep() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
 
     res = sieve_register_imapflags(i, NULL);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_imapflags() returns %d\n", res);
+	i_error("sieve_register_imapflags() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
 
     res = sieve_register_size(i, (sieve_get_size *) &foo);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_size() returns %d\n", res);
+	i_error("sieve_register_size() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
   
     res = sieve_register_header(i, (sieve_get_header *) &foo);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_header() returns %d\n", res);
+	i_error("sieve_register_header() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
   
     res = sieve_register_envelope(i, (sieve_get_envelope *) &foo);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_envelope() returns %d\n", res);
+	i_error("sieve_register_envelope() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
   
     res = sieve_register_vacation(i, &vacation);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_vacation() returns %d\n", res);
+	i_error("sieve_register_vacation() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
 
     res = sieve_register_notify(i, &sieve_notify);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_notify() returns %d\n", res);
+	i_error("sieve_register_notify() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }
 
     res = sieve_register_parse_error(i, &mysieve_error);
     if (res != SIEVE_OK) {
-	syslog(LOG_ERR, "sieve_register_parse_error() returns %d\n", res);
+	i_error("sieve_register_parse_error() returns %d\n", res);
 	return TIMSIEVE_FAIL;
     }