s/""/null_string/

diff --git a/src/acl.cc b/src/acl.cc
index bbab42633fa45a8482b965f4887f545d6487df04..b173017c5c8ef6de1318507d589c3b8c71f29768 100644 (file)
--- a/src/acl.cc
+++ b/src/acl.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: acl.cc,v 1.53 1996/10/24 20:56:33 wessels Exp $
+ * $Id: acl.cc,v 1.54 1996/10/24 23:31:11 wessels Exp $
  *
  * DEBUG: section 28    Access Control
  * AUTHOR: Duane Wessels
@@ -905,7 +905,7 @@ aclMatchAclList(struct _acl_list *list, aclCheck_t * checklist)
     while (list) {
        AclMatchedName = list->acl->name;
        debug(28, 3, "aclMatchAclList: checking %s%s\n",
-           list->op ? "" : "!", list->acl->name);
+           list->op ? null_string : "!", list->acl->name);
        if (aclMatchAcl(list->acl, checklist) != list->op) {
            debug(28, 3, "aclMatchAclList: returning 0\n");
            return 0;

diff --git a/src/ftp.cc b/src/ftp.cc
index a86b88978e47cf962c7a2bb2b4b6ffb2a239d705..42b4c1a30e909b5d8999d8d6445e561aadb276aa 100644 (file)
--- a/src/ftp.cc
+++ b/src/ftp.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: ftp.cc,v 1.67 1996/10/15 18:06:23 wessels Exp $
+ * $Id: ftp.cc,v 1.68 1996/10/24 23:31:13 wessels Exp $
  *
  * DEBUG: section 9     File Transfer Protocol (FTP)
  * AUTHOR: Harvest Derived
@@ -171,7 +171,7 @@ ftp_login_parser(char *login, FtpStateData * data)
        *s = 0;
        strcpy(password, s + 1);
     } else {
-       strcpy(password, "");
+       strcpy(password, null_string
     }
 
     if (!*user && !*password) {

diff --git a/src/stat.cc b/src/stat.cc
index 51510babac390065edd14a9308efdf99d77eeb8f..7687b2b51a9b405904d077ceb8923cafb6fd066d 100644 (file)
--- a/src/stat.cc
+++ b/src/stat.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: stat.cc,v 1.91 1996/10/24 06:11:57 wessels Exp $
+ * $Id: stat.cc,v 1.92 1996/10/24 23:31:17 wessels Exp $
  *
  * DEBUG: section 18    Cache Manager Statistics
  * AUTHOR: Harvest Derived
@@ -666,18 +666,18 @@ statFiledescriptors(StoreEntry * sentry)
            break;
        case FD_FILE:
            storeAppendPrintf(sentry, "%31s %s}\n",
-               "",
+               null_string,
                (s = diskFileName(i)) ? s : "-");
            break;
        case FD_PIPE:
-           storeAppendPrintf(sentry, "%31s %s}\n", "", fd_note(i, NULL));
+           storeAppendPrintf(sentry, "%31s %s}\n", null_string, fd_note(i, NULL));
            break;
        case FD_LOG:
-           storeAppendPrintf(sentry, "%31s %s}\n", "", fd_note(i, NULL));
+           storeAppendPrintf(sentry, "%31s %s}\n", null_string, fd_note(i, NULL));
            break;
        case FD_UNKNOWN:
        default:
-           storeAppendPrintf(sentry, "%31s %s}\n", "", fd_note(i, NULL));
+           storeAppendPrintf(sentry, "%31s %s}\n", null_string, fd_note(i, NULL));
            break;
        }
     }
@@ -1132,7 +1132,7 @@ log_append(cacheinfo * obj,
                method,
                url,
                ident,
-               hier_timeout ? "TIMEOUT_" : "",
+               hier_timeout ? "TIMEOUT_" : null_string,
                hier_strings[hier_code],
                hier_host);
 #if LOG_FULL_HEADERS

diff --git a/src/url.cc b/src/url.cc
index d52ce8259db986ada55fc125d9fd314574e018a1..ae7f64d9920c0067c5c35602720d560475ad39b3 100644 (file)
--- a/src/url.cc
+++ b/src/url.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: url.cc,v 1.35 1996/10/09 15:34:41 wessels Exp $
+ * $Id: url.cc,v 1.36 1996/10/24 23:31:19 wessels Exp $
  *
  * DEBUG: section 23    URL Parsing
  * AUTHOR: Duane Wessels
@@ -265,7 +265,7 @@ urlCanonical(request_t * request, char *buf)
        sprintf(buf, "%s://%s%s%s%s%s",
            ProtocolStr[request->protocol],
            request->login,
-           *request->login ? "@" : "",
+           *request->login ? "@" : null_string,
            request->host,
            portbuf,
            request->urlpath);