From: wessels <>
Date: Thu, 13 Nov 1997 06:38:08 +0000 (+0000)
Subject: remove fatal_dump calls
X-Git-Tag: SQUID_3_0_PRE1~4545
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8a5e92cee75bac210733c2f5bd98d585c9759fd9;p=thirdparty%2Fsquid.git

remove fatal_dump calls
---

diff --git a/src/cache_cf.cc b/src/cache_cf.cc
index 28782186eb..e73cf6ff7c 100644
--- a/src/cache_cf.cc
+++ b/src/cache_cf.cc
@@ -1,5 +1,5 @@
 /*
- * $Id: cache_cf.cc,v 1.231 1997/11/12 23:36:22 wessels Exp $
+ * $Id: cache_cf.cc,v 1.232 1997/11/12 23:38:08 wessels Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -435,7 +435,7 @@ static void
 parse_cachedir(struct _cacheSwap *swap)
 {
     char *token;
-    char *path;
+    ehar *path;
     int i;
     int size;
     int l1;
@@ -444,8 +444,6 @@ parse_cachedir(struct _cacheSwap *swap)
     SwapDir *tmp = NULL;
     if ((path = strtok(NULL, w_space)) == NULL)
 	self_destruct();
-    if (strlen(path) > (SQUID_MAXPATHLEN - 32))
-	fatal_dump("cache_dir pathname is too long");
     GetInteger(i);
     size = i << 10;		/* Mbytes to kbytes */
     GetInteger(i);
diff --git a/src/store.cc b/src/store.cc
index 6986fbcba5..9a0c65bbf4 100644
--- a/src/store.cc
+++ b/src/store.cc
@@ -1,6 +1,6 @@
 
 /*
- * $Id: store.cc,v 1.338 1997/11/12 00:09:09 wessels Exp $
+ * $Id: store.cc,v 1.339 1997/11/12 23:41:12 wessels Exp $
  *
  * DEBUG: section 20    Storeage Manager
  * AUTHOR: Harvest Derived
@@ -461,8 +461,7 @@ storeReleaseRequest(StoreEntry * e)
 {
     if (EBIT_TEST(e->flag, RELEASE_REQUEST))
 	return;
-    if (!storeEntryLocked(e))
-	fatal_dump("storeReleaseRequest: unlocked entry");
+    assert(storeEntryLocked(e));
     debug(20, 3) ("storeReleaseRequest: '%s'\n", storeKeyText(e->key));
     EBIT_SET(e->flag, RELEASE_REQUEST);
     storeSetPrivateKey(e);
@@ -1799,10 +1798,7 @@ storeEntryValidLength(const StoreEntry * e)
     int diff;
     int hdr_sz;
     int content_length;
-
-    if (e->mem_obj == NULL)
-	fatal_dump("storeEntryValidLength: NULL mem_obj");
-
+    assert(e->mem_obj != NULL);
     hdr_sz = e->mem_obj->reply->hdr_sz;
     content_length = e->mem_obj->reply->content_length;
 
@@ -1902,8 +1898,7 @@ storeConfigure(void)
 int
 urlcmp(const void *url1, const void *url2)
 {
-    if (!url1 || !url2)
-	fatal_dump("urlcmp: Got a NULL url pointer.");
+    assert(url1 && url2);
     return (strcmp(url1, url2));
 }