From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Fri, 26 Mar 2010 13:34:04 +0000 (-0600)
Subject: Cannot use String as a global due to memory pool dependencies.
X-Git-Tag: SQUID_3_2_0_1~93^2~36
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2664c45786468bb834484e515d252ee85a6c2bf1;p=thirdparty%2Fsquid.git

Cannot use String as a global due to memory pool dependencies.
---

diff --git a/src/globals.h b/src/globals.h
index d31242ab28..d912d20d13 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -173,7 +173,7 @@ extern "C" {
     extern const char *external_acl_message;      /* NULL */
     extern int opt_send_signal;	/* -1 */
     extern int opt_no_daemon; /* 0 */
-    extern String KidName; /* APP_SHORTNAME */
+    extern char KidName[NAME_MAX];
     extern int KidIdentifier; /* 0 */
 
 
diff --git a/src/main.cc b/src/main.cc
index 2d5335b929..7a867bafdd 100644
--- a/src/main.cc
+++ b/src/main.cc
@@ -1158,10 +1158,12 @@ ConfigureCurrentKid(const char *processName)
         if (const char *idStart = strrchr(processName, '-')) {
             KidIdentifier = atoi(idStart + 1);
             const int nameLen = idStart - (processName + 1);
-			KidName.limitInit(processName + 1, nameLen);
+            xstrncpy(KidName, processName + 1, nameLen + 1);
         }
+    } else {
+        xstrncpy(KidName, APP_SHORTNAME, sizeof(KidName));
+        KidIdentifier = 0;
     }
-    // else use defaults, but it should not happen except for the main process
 }
 
 int