Converted ch_malloc and ch_calloc calls to SLAP_MALLOC and SLAP_CALLOC.

[openldap] / servers / slurpd / replog.c

diff --git a/servers/slurpd/replog.c b/servers/slurpd/replog.c
index a93f9040d50b194570c85bcc2e8d16e59a3265eb..471275a6dfc11b0d4aeaf5be36407427ce08362d 100644 (file)
--- a/servers/slurpd/replog.c
+++ b/servers/slurpd/replog.c
@@ -24,6 +24,7 @@
 
 #include <stdio.h>
 
+#include <ac/stdlib.h>
 #include <ac/errno.h>
 #include <ac/param.h>
 #include <ac/string.h>
@@ -58,8 +59,8 @@ copy_replog(
     char       *p;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "replog", LDAP_LEVEL_ARGS, "copy_replog: "
-               "copy replog \"%s\" to \"%s\"\n", src, dst ));
+       LDAP_LOG ( SLURPD, ARGS, "copy_replog: "
+               "copy replog \"%s\" to \"%s\"\n", src, dst, 0 );
 #else
     Debug( LDAP_DEBUG_ARGS,
            "copy replog \"%s\" to \"%s\"\n", 
@@ -71,16 +72,16 @@ copy_replog(
      * with a fatal error.
      */
     strcpy( buf, src );
-    if (( p = strrchr( buf, '/' )) == NULL ) {
+    if (( p = strrchr( buf, LDAP_DIRSEP[0] )) == NULL ) {
        strcpy( buf, "." );
     } else {
        *p = '\0';
     }
     if ( access( buf, W_OK ) < 0 ) {
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "replog", LDAP_LEVEL_ERR, "copy_replog: "
+       LDAP_LOG ( SLURPD, ERR, "copy_replog: "
                "Error: (%ld): Directory %s is not writable\n",
-               (long) getpid(), buf ));
+               (long) getpid(), buf, 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "Error: copy_replog (%ld): Directory %s is not writable\n",
@@ -89,16 +90,16 @@ copy_replog(
        return( -1 );
     }
     strcpy( buf, dst );
-    if (( p = strrchr( buf, '/' )) == NULL ) {
+    if (( p = strrchr( buf, LDAP_DIRSEP[0] )) == NULL ) {
        strcpy( buf, "." );
     } else {
        *p = '\0';
     }
     if ( access( buf, W_OK ) < 0 ) {
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "replog", LDAP_LEVEL_ERR, "copy_replog: "
+       LDAP_LOG ( SLURPD, ERR, "copy_replog: "
                "Error: (%ld): Directory %s is not writable\n",
-               (long) getpid(), buf ));
+               (long) getpid(), buf, 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "Error: copy_replog (%ld): Directory %s is not writable\n",
@@ -111,9 +112,9 @@ copy_replog(
     rfp = lock_fopen( src, "r", &lfp );
     if ( rfp == NULL ) {
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "replog", LDAP_LEVEL_ERR, "copy_replog: "
+       LDAP_LOG ( SLURPD, ERR, "copy_replog: "
                "Error: Can't lock replog \"%s\" for read: %s\n",
-               src, sys_errlist[ errno ] ));
+               src, sys_errlist[ errno ], 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "Error: copy_replog: Can't lock replog \"%s\" for read: %s\n",
@@ -126,9 +127,9 @@ copy_replog(
     dfp = lock_fopen( dst, "a", &dlfp );
     if ( dfp == NULL ) {
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "replog", LDAP_LEVEL_ERR, "copy_replog: "
+       LDAP_LOG ( SLURPD, ERR, "copy_replog: "
                "Error: Can't lock replog \"%s\" for write: %s\n",
-               src, sys_errlist[ errno ] ));
+               src, sys_errlist[ errno ], 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "Error: copy_replog: Can't lock replog \"%s\" for write: %s\n",
@@ -141,7 +142,7 @@ copy_replog(
     /*
      * Make our own private copy of the replication log.
      */
-    while (( p = fgets( rbuf, sizeof( buf ), rfp )) != NULL ) {
+    while (( p = fgets( rbuf, sizeof( rbuf ), rfp )) != NULL ) {
        fputs( rbuf, dfp );
     }
     /* Only truncate the source file if we're not in one-shot mode */
@@ -152,8 +153,8 @@ copy_replog(
 
     if ( lock_fclose( dfp, dlfp ) == EOF ) {
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "replog", LDAP_LEVEL_ERR, "copy_replog: "
-               "Error: Error closing \"%s\"\n", src ));
+       LDAP_LOG ( SLURPD, ERR, "copy_replog: "
+               "Error: Error closing \"%s\"\n", src, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "Error: copy_replog: Error closing \"%s\"\n",
@@ -162,8 +163,8 @@ copy_replog(
     }
     if ( lock_fclose( rfp, lfp ) == EOF ) {
 #ifdef NEW_LOGGING
-       LDAP_LOG (( "replog", LDAP_LEVEL_ERR, "copy_replog: "
-               "Error: Error closing \"%s\"\n", src ));
+       LDAP_LOG ( SLURPD, ERR, "copy_replog: "
+               "Error: Error closing \"%s\"\n", src, 0, 0 );
 #else
        Debug( LDAP_DEBUG_ANY,
                "Error: copy_replog: Error closing \"%s\"\n",