compiler

diff --git a/src/store.cc b/src/store.cc
index 9181176a5d8f36d0210cb143fc803a9e5326e6f6..72517fd809e670ba9dd7a24d2a0a5565be618a0d 100644 (file)
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: store.cc,v 1.83 1996/08/19 22:45:31 wessels Exp $
+ * $Id: store.cc,v 1.84 1996/08/19 23:09:25 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -689,7 +689,7 @@ void storeSetPrivateKey(e)
        fatal_dump("Private key already exists.");
     }
     if (e->key)
-       storeHashDelete((hash_link *) e);
+       storeHashDelete(e);
     if (e->key && !BIT_TEST(e->flag, KEY_URL))
        safe_free(e->key);
     e->key = xstrdup(newkey);
@@ -721,7 +721,7 @@ void storeSetPublicKey(e)
        newkey = storeGeneratePublicKey(e->url, e->method);
     }
     if (e->key)
-       storeHashDelete((hash_link *) e);
+       storeHashDelete(e);
     if (e->key && !BIT_TEST(e->flag, KEY_URL))
        safe_free(e->key);
     if (e->method == METHOD_GET) {

diff --git a/src/tools.cc b/src/tools.cc
index 239e5e8ec809146c88d671bbf339ef4c8d914685..d9610be560e728396d40225371174eeed4d04dd8 100644 (file)
--- a/src/tools.cc
+++ b/src/tools.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: tools.cc,v 1.47 1996/08/19 22:44:57 wessels Exp $
+ * $Id: tools.cc,v 1.48 1996/08/19 23:09:26 wessels Exp $
  *
  * DEBUG: section 21    Misc Functions
  * AUTHOR: Harvest Derived
@@ -137,10 +137,10 @@ void mail_warranty()
     if ((fp = fopen(filename, "w")) == NULL)
        return;
     fprintf(fp, "From: %s\n", appname);
-    fprintf(fp, "To: %s\n", getAdminEmail());
+    fprintf(fp, "To: %s\n", Config.adminEmail);
     fprintf(fp, "Subject: %s\n", dead_msg());
     fclose(fp);
-    sprintf(command, "mail %s < %s", getAdminEmail(), filename);
+    sprintf(command, "mail %s < %s", Config.adminEmail, filename);
     system(command);           /* XXX should avoid system(3) */
     unlink(filename);
 }
@@ -235,7 +235,7 @@ void death(sig)
     PrintRusage(NULL, debug_log);
     if (squid_curtime - SQUID_RELEASE_TIME < 864000) {
        /* skip if more than 10 days old */
-       if (getAdminEmail())
+       if (Config.adminEmail)
            mail_warranty();
        else
            puts(dead_msg());