snapshot of project "lynx", label v2-8-9dev_11c

25 files changed, 35 insertions, 189 deletions

diff --git a/WWW/Library/Implementation/HTAABrow.c b/WWW/Library/Implementation/HTAABrow.c
index f1d3c313..31a0a469 100644
--- a/WWW/Library/Implementation/HTAABrow.c
+++ b/WWW/Library/Implementation/HTAABrow.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAABrow.c,v 1.40 2013/11/28 11:11:05 tom Exp $
+ * $LynxId: HTAABrow.c,v 1.41 2016/11/24 15:14:00 tom Exp $
  *
  * MODULE							HTAABrow.c
  *		BROWSER SIDE ACCESS AUTHORIZATION MODULE
@@ -150,8 +150,6 @@ void HTAAForwardAuth_set(const char *scheme_name,
     if ((HTAAForwardAuth = typecallocn(char, len)) == 0)
 	  outofmem(__FILE__, "HTAAForwardAuth_set");
 
-    assert(HTAAForwardAuth != 0);
-
     strcpy(HTAAForwardAuth, "Authorization: ");
     if (scheme_name) {
 	strcat(HTAAForwardAuth, scheme_name);
@@ -196,8 +194,6 @@ static HTAAServer *HTAAServer_new(const char *hostname,
     if ((server = typecalloc(HTAAServer)) == 0)
 	  outofmem(__FILE__, "HTAAServer_new");
 
-    assert(server != NULL);
-
     server->hostname = NULL;
     server->portnumber = (portnumber > 0 ? portnumber : 80);
     server->IsProxy = (BOOLEAN) IsProxy;
@@ -399,8 +395,6 @@ static HTAASetup *HTAASetup_new(HTAAServer *server, char *ctemplate,
     if ((setup = typecalloc(HTAASetup)) == 0)
 	outofmem(__FILE__, "HTAASetup_new");
 
-    assert(setup != NULL);
-
     setup->retry = NO;
     setup->server = server;
     setup->ctemplate = NULL;
@@ -523,8 +517,6 @@ static HTAARealm *HTAARealm_new(HTList *realm_table,
 	if ((realm = typecalloc(HTAARealm)) == 0)
 	      outofmem(__FILE__, "HTAARealm_new");
 
-	assert(realm != NULL);
-
 	realm->realmname = NULL;
 	realm->username = NULL;
 	realm->password = NULL;
@@ -679,8 +671,6 @@ static char *compose_auth_string(HTAAScheme scheme, HTAASetup * setup, int IsPro
     if ((cleartext = typecallocn(char, len)) == 0)
 	  outofmem(__FILE__, "compose_auth_string");
 
-    assert(cleartext != NULL);
-
     if (realm->username)
 	strcpy(cleartext, realm->username);
     else
@@ -927,8 +917,6 @@ char *HTAA_composeAuth(const char *hostname,
 	if ((HTAA_composeAuthResult = typecallocn(char, len)) == 0)
 	      outofmem(__FILE__, "HTAA_composeAuth");
 
-	assert(HTAA_composeAuthResult != NULL);
-
 	strcpy(HTAA_composeAuthResult, "Proxy-Authorization: ");
 
     } else {
@@ -1007,8 +995,6 @@ char *HTAA_composeAuth(const char *hostname,
 	if ((HTAA_composeAuthResult = typecallocn(char, len)) == 0)
 	      outofmem(__FILE__, "HTAA_composeAuth");
 
-	assert(HTAA_composeAuthResult != NULL);
-
 	strcpy(HTAA_composeAuthResult, "Authorization: ");
     }
 
@@ -1109,8 +1095,6 @@ BOOL HTAA_shouldRetryWithAuth(char *start_of_headers,
 			if (!scheme_specifics)
 			    outofmem(__FILE__, "HTAA_shouldRetryWithAuth");
 
-			assert(scheme_specifics != NULL);
-
 			for (i = 0; i < HTAA_MAX_SCHEMES; i++)
 			    scheme_specifics[i] = NULL;
 		    }
diff --git a/WWW/Library/Implementation/HTAAProt.c b/WWW/Library/Implementation/HTAAProt.c
index 03243815..d5117f1c 100644
--- a/WWW/Library/Implementation/HTAAProt.c
+++ b/WWW/Library/Implementation/HTAAProt.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAAProt.c,v 1.33 2013/11/28 11:11:05 tom Exp $
+ * $LynxId: HTAAProt.c,v 1.34 2016/11/24 15:29:50 tom Exp $
  *
  * MODULE							HTAAProt.c
  *		PROTECTION FILE PARSING MODULE
@@ -346,8 +346,6 @@ static HTAAProt *HTAAProt_new(const char *cur_docname,
 	if ((prot = typecalloc(HTAAProt)) == 0)
 	      outofmem(__FILE__, "HTAAProt_new");
 
-	assert(prot != NULL);
-
 	prot->ctemplate = NULL;
 	prot->filename = NULL;
 	prot->uid_name = NULL;
@@ -362,8 +360,6 @@ static HTAAProt *HTAAProt_new(const char *cur_docname,
 	    if ((cache_item = typecalloc(HTAAProtCache)) == 0)
 		outofmem(__FILE__, "HTAAProt_new");
 
-	    assert(cache_item != NULL);
-
 	    cache_item->prot = prot;
 	    cache_item->prot_filename = NULL;
 	    StrAllocCopy(cache_item->prot_filename, prot_filename);
diff --git a/WWW/Library/Implementation/HTAAUtil.c b/WWW/Library/Implementation/HTAAUtil.c
index f7ed67c1..1be26f90 100644
--- a/WWW/Library/Implementation/HTAAUtil.c
+++ b/WWW/Library/Implementation/HTAAUtil.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAAUtil.c,v 1.35 2013/05/03 20:32:37 tom Exp $
+ * $LynxId: HTAAUtil.c,v 1.36 2016/11/24 15:29:50 tom Exp $
  *
  * MODULE							HTAAUtil.c
  *		COMMON PARTS OF ACCESS AUTHORIZATION MODULE
@@ -488,8 +488,6 @@ void HTAA_setupReader(char *start_of_headers,
     if (buffer == NULL)
 	outofmem(__FILE__, "HTAA_setupReader");
 
-    assert(buffer != NULL);
-
 #ifdef LY_FIND_LEAKS
     atexit(FreeHTAAUtil);
 #endif
diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c
index be142e83..4c2c1be5 100644
--- a/WWW/Library/Implementation/HTAccess.c
+++ b/WWW/Library/Implementation/HTAccess.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAccess.c,v 1.79 2013/11/28 11:11:05 tom Exp $
+ * $LynxId: HTAccess.c,v 1.80 2016/11/24 15:29:50 tom Exp $
  *
  *		Access Manager					HTAccess.c
  *		==============
@@ -1283,8 +1283,6 @@ BOOL HTSearch(const char *keywords,
     if (escaped == NULL)
 	outofmem(__FILE__, "HTSearch");
 
-    assert(escaped != NULL);
-
     StrAllocCopy(address, here->isIndexAction);
 
     /*
diff --git a/WWW/Library/Implementation/HTAnchor.c b/WWW/Library/Implementation/HTAnchor.c
index 616b69c4..ee0a0084 100644
--- a/WWW/Library/Implementation/HTAnchor.c
+++ b/WWW/Library/Implementation/HTAnchor.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAnchor.c,v 1.76 2013/11/28 11:34:24 tom Exp $
+ * $LynxId: HTAnchor.c,v 1.77 2016/11/24 15:29:50 tom Exp $
  *
  *	Hypertext "Anchor" Object				HTAnchor.c
  *	==========================
@@ -86,8 +86,6 @@ static HTParentAnchor0 *HTParentAnchor0_new(const char *address,
     if (newAnchor == NULL)
 	outofmem(__FILE__, "HTParentAnchor0_new");
 
-    assert(newAnchor != NULL);
-
     newAnchor->parent = newAnchor;	/* self */
     StrAllocCopy(newAnchor->address, address);
     newAnchor->adult_hash = (HASH_TYPE) hash;
@@ -102,8 +100,6 @@ static HTParentAnchor *HTParentAnchor_new(HTParentAnchor0 *parent)
     if (newAnchor == NULL)
 	outofmem(__FILE__, "HTParentAnchor_new");
 
-    assert(newAnchor != NULL);
-
     newAnchor->parent = parent;	/* cross reference */
     parent->info = newAnchor;	/* cross reference */
     newAnchor->address = parent->address;	/* copy pointer */
@@ -124,8 +120,6 @@ static HTChildAnchor *HTChildAnchor_new(HTParentAnchor0 *parent)
     if (p == NULL)
 	outofmem(__FILE__, "HTChildAnchor_new");
 
-    assert(p != NULL);
-
     p->parent = parent;		/* parent reference */
     return p;
 }
@@ -138,8 +132,6 @@ static HTChildAnchor *HText_pool_ChildAnchor_new(HTParentAnchor *parent)
     if (p == NULL)
 	outofmem(__FILE__, "HText_pool_ChildAnchor_new");
 
-    assert(p != NULL);
-
     p->parent = parent->parent;	/* parent reference */
     return p;
 }
@@ -1315,8 +1307,6 @@ LYUCcharset *HTAnchor_getUCInfoStage(HTParentAnchor *me,
 	    if (stages == NULL)
 		outofmem(__FILE__, "HTAnchor_getUCInfoStage");
 
-	    assert(stages != NULL);
-
 	    for (i = 0; i < UCT_STAGEMAX; i++) {
 		stages->s[i].C.MIMEname = "";
 		stages->s[i].LYhndl = -1;
diff --git a/WWW/Library/Implementation/HTAssoc.c b/WWW/Library/Implementation/HTAssoc.c
index 22c1126c..831b1967 100644
--- a/WWW/Library/Implementation/HTAssoc.c
+++ b/WWW/Library/Implementation/HTAssoc.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAssoc.c,v 1.10 2010/04/29 09:34:03 tom Exp $
+ * $LynxId: HTAssoc.c,v 1.11 2016/11/24 15:29:50 tom Exp $
  *
  * MODULE							HTAssoc.c
  *	    ASSOCIATION LIST FOR STORING NAME-VALUE PAIRS.
@@ -55,8 +55,6 @@ void HTAssocList_add(HTAssocList *alist,
 	if (!(assoc = (HTAssoc *) malloc(sizeof(HTAssoc))))
 	      outofmem(__FILE__, "HTAssoc_add");
 
-	assert(assoc != NULL);
-
 	assoc->name = NULL;
 	assoc->value = NULL;
 
diff --git a/WWW/Library/Implementation/HTAtom.c b/WWW/Library/Implementation/HTAtom.c
index 3a96ba4e..914a7f37 100644
--- a/WWW/Library/Implementation/HTAtom.c
+++ b/WWW/Library/Implementation/HTAtom.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTAtom.c,v 1.19 2013/11/28 11:11:05 tom Exp $
+ * $LynxId: HTAtom.c,v 1.20 2016/11/24 15:29:50 tom Exp $
  *
  *			Atoms: Names to numbers			HTAtom.c
  *			=======================
@@ -82,14 +82,10 @@ HTAtom *HTAtom_for(const char *string)
     if (a == NULL)
 	outofmem(__FILE__, "HTAtom_for");
 
-    assert(a != NULL);
-
     a->name = (char *) malloc(strlen(string) + 1);
     if (a->name == NULL)
 	outofmem(__FILE__, "HTAtom_for");
 
-    assert(a->name != NULL);
-
     strcpy(a->name, string);
     a->next = hash_table[hash];	/* Put onto the head of list */
     hash_table[hash] = a;
diff --git a/WWW/Library/Implementation/HTBTree.c b/WWW/Library/Implementation/HTBTree.c
index 3a76550e..f595bae0 100644
--- a/WWW/Library/Implementation/HTBTree.c
+++ b/WWW/Library/Implementation/HTBTree.c
@@ -24,8 +24,6 @@ HTBTree *HTBTree_new(HTComparer comp)
     if (tree == NULL)
 	outofmem(__FILE__, "HTBTree_new");
 
-    assert(tree != NULL);
-
     tree->compare = comp;
     tree->top = NULL;
 
@@ -146,8 +144,6 @@ void HTBTree_add(HTBTree *tree,
 	if (tree->top == NULL)
 	    outofmem(__FILE__, "HTBTree_add");
 
-	assert(tree->top != NULL);
-
 	tree->top->up = NULL;
 	tree->top->object = object;
 	tree->top->left = NULL;
@@ -173,8 +169,6 @@ void HTBTree_add(HTBTree *tree,
 		    if (father_of_element->left == NULL)
 			outofmem(__FILE__, "HTBTree_add");
 
-		    assert(father_of_element->left != NULL);
-
 		    added_element = father_of_element->left;
 		    added_element->up = father_of_element;
 		    added_element->object = object;
@@ -192,7 +186,6 @@ void HTBTree_add(HTBTree *tree,
 
 		    if (father_of_element->right == NULL)
 			outofmem(__FILE__, "HTBTree_add");
-		    assert(father_of_element->right != NULL);
 
 		    added_element = father_of_element->right;
 		    added_element->up = father_of_element;
diff --git a/WWW/Library/Implementation/HTChunk.c b/WWW/Library/Implementation/HTChunk.c
index 2ea36c85..6b670116 100644
--- a/WWW/Library/Implementation/HTChunk.c
+++ b/WWW/Library/Implementation/HTChunk.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTChunk.c,v 1.27 2012/02/07 11:28:44 tom Exp $
+ * $LynxId: HTChunk.c,v 1.28 2016/11/24 15:29:50 tom Exp $
  *
  *		Chunk handling:	Flexible arrays
  *		===============================
@@ -48,8 +48,6 @@ HTChunk *HTChunkCreateMayFail(int grow, int failok)
 	}
     }
 
-    assert(ch != NULL);
-
     HTChunkInit(ch, grow);
     ch->failok = failok;
     return ch;
@@ -65,8 +63,6 @@ HTChunk *HTChunkCreate2(int grow, size_t needed)
     if (ch == NULL)
 	outofmem(__FILE__, "HTChunkCreate2");
 
-    assert(ch != NULL);
-
     HTChunkInit(ch, grow);
     if (needed-- > 0) {
 	/* Round up */
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 49af1828..d2c8bdf2 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFTP.c,v 1.126 2014/07/24 22:08:24 tom Exp $
+ * $LynxId: HTFTP.c,v 1.127 2016/11/24 16:22:50 tom Exp $
  *
  *			File Transfer Protocol (FTP) Client
  *			for a WorldWideWeb browser
@@ -309,9 +309,6 @@ char *HTVMS_name(const char *nn,
     if (!filename || !nodename)
 	outofmem(__FILE__, "HTVMSname");
 
-    assert(filename != NULL);
-    assert(nodename != NULL);
-
     strcpy(filename, fn);
     strcpy(nodename, "");	/* On same node?  Yes if node names match */
     if (StrNCmp(nn, "localhost", 9)) {
@@ -823,8 +820,6 @@ static int get_connection(const char *arg,
 	con = typecalloc(connection);
 	if (con == NULL)
 	    outofmem(__FILE__, "get_connection");
-
-	assert(con != NULL);
     }
     con->socket = -1;
 
@@ -2283,8 +2278,6 @@ static EntryInfo *parse_dir_entry(char *entry,
     if (entry_info == NULL)
 	outofmem(__FILE__, "parse_dir_entry");
 
-    assert(entry_info != NULL);
-
     entry_info->display = TRUE;
 
     switch (server_type) {
diff --git a/WWW/Library/Implementation/HTFile.c b/WWW/Library/Implementation/HTFile.c
index 1da1d19c..74ab62c1 100644
--- a/WWW/Library/Implementation/HTFile.c
+++ b/WWW/Library/Implementation/HTFile.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFile.c,v 1.144 2014/12/08 01:38:05 tom Exp $
+ * $LynxId: HTFile.c,v 1.145 2016/11/24 15:29:50 tom Exp $
  *
  *			File Access				HTFile.c
  *			===========
@@ -556,8 +556,6 @@ void HTSetSuffix5(const char *suffix,
 	    if (suff == NULL)
 		outofmem(__FILE__, "HTSetSuffix");
 
-	    assert(suff != NULL);
-
 	    if (!HTSuffixes) {
 		HTSuffixes = HTList_new();
 #ifdef LY_FIND_LEAKS
diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index 54850418..1ba5f199 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFormat.c,v 1.84 2016/04/26 09:11:03 tom Exp $
+ * $LynxId: HTFormat.c,v 1.85 2016/11/24 15:29:50 tom Exp $
  *
  *		Manage different file formats			HTFormat.c
  *		=============================
@@ -96,7 +96,6 @@ void HTSetPresentation(const char *representation,
     if (pres == NULL)
 	outofmem(__FILE__, "HTSetPresentation");
 
-    assert(pres != NULL);
     assert(representation != NULL);
 
     CTRACE2(TRACE_CFG,
@@ -159,8 +158,6 @@ void HTSetConversion(const char *representation_in,
     if (pres == NULL)
 	outofmem(__FILE__, "HTSetConversion");
 
-    assert(pres != NULL);
-
     CTRACE2(TRACE_CFG,
 	    (tfp,
 	     "HTSetConversion rep_in=%s, rep_out=%s, qual=%f\n",
@@ -1874,8 +1871,6 @@ HTStream *HTNetToText(HTStream *sink)
     if (me == NULL)
 	outofmem(__FILE__, "NetToText");
 
-    assert(me != NULL);
-
     me->isa = &NetToTextClass;
 
     me->had_cr = NO;
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
index a8c8c434..4828a785 100644
--- a/WWW/Library/Implementation/HTGopher.c
+++ b/WWW/Library/Implementation/HTGopher.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTGopher.c,v 1.63 2016/10/15 01:11:44 tom Exp $
+ * $LynxId: HTGopher.c,v 1.65 2016/11/24 16:38:54 tom Exp $
  *
  *			GOPHER ACCESS				HTGopher.c
  *			=============
@@ -692,8 +692,6 @@ static void de_escape(char *command, const char *selector)
     if (command == NULL)
 	outofmem(__FILE__, "HTLoadGopher");
 
-    assert(command != NULL);
-
     q = command;
     while (*p) {		/* Decode hex */
 	if (*p == HEX_ESCAPE) {
@@ -1030,8 +1028,6 @@ static int parse_cso_fields(char *buf,
 			    outofmem(__FILE__, "HTLoadCSO");
 			}
 
-			assert(newf != NULL);
-
 			if (last)
 			    last->next = newf;
 			else
@@ -1517,7 +1513,7 @@ static int HTLoadCSO(const char *arg,
     Target = HTStreamStack(format_in,
 			   format_out,
 			   sink, anAnchor);
-    if (!Target || Target == NULL) {
+    if (Target == NULL) {
 	char *temp = 0;
 
 	HTSprintf0(&temp, CANNOT_CONVERT_I_TO_O,
@@ -1803,8 +1799,6 @@ static int HTLoadGopher(const char *arg,
 	    if (command == NULL)
 		outofmem(__FILE__, "HTLoadGopher");
 
-	    assert(command != NULL);
-
 	    de_escape(command, selector);	/* Bug fix TBL 921208 */
 
 	    strcat(command, "\t");
@@ -1839,8 +1833,6 @@ static int HTLoadGopher(const char *arg,
 	    if (command == NULL)
 		outofmem(__FILE__, "HTLoadGopher");
 
-	    assert(command != NULL);
-
 	    de_escape(command, selector);	/* Bug fix TBL 921208 */
 
 	    strcpy(command, "query ");
@@ -1860,8 +1852,6 @@ static int HTLoadGopher(const char *arg,
 	    if (command == NULL)
 		outofmem(__FILE__, "HTLoadGopher");
 
-	    assert(command != NULL);
-
 	    de_escape(command, selector);
 	}
 	FREE(p1);
diff --git a/WWW/Library/Implementation/HTGroup.c b/WWW/Library/Implementation/HTGroup.c
index e2e39791..c1172f00 100644
--- a/WWW/Library/Implementation/HTGroup.c
+++ b/WWW/Library/Implementation/HTGroup.c
@@ -108,8 +108,6 @@ static AddressDefList *parse_address_part(FILE *fp)
 	if (ref == NULL)
 	    outofmem(__FILE__, "parse_address_part");
 
-	assert(ref != NULL);
-
 	ref->name = NULL;
 	ref->translation = NULL;
 	StrAllocCopy(ref->name, HTlex_buffer);
@@ -167,8 +165,6 @@ static UserDefList *parse_user_part(FILE *fp)
 	if (ref == NULL)
 	    outofmem(__FILE__, "parse_user_part");
 
-	assert(ref != NULL);
-
 	ref->name = NULL;
 	ref->translation = NULL;
 	StrAllocCopy(ref->name, HTlex_buffer);
@@ -243,8 +239,6 @@ static Item *parse_item(FILE *fp)
     if (item == NULL)
 	outofmem(__FILE__, "parse_item");
 
-    assert(item != NULL);
-
     item->user_def_list = user_def_list;
     item->address_def_list = address_def_list;
     return item;
@@ -293,8 +287,6 @@ GroupDef *HTAA_parseGroupDef(FILE *fp)
     if (group_def == NULL)
 	outofmem(__FILE__, "HTAA_parseGroupDef");
 
-    assert(group_def != NULL);
-
     group_def->group_name = NULL;
     group_def->item_list = item_list;
 
diff --git a/WWW/Library/Implementation/HTList.c b/WWW/Library/Implementation/HTList.c
index 996bea3d..d12cd38c 100644
--- a/WWW/Library/Implementation/HTList.c
+++ b/WWW/Library/Implementation/HTList.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTList.c,v 1.19 2013/01/04 00:31:27 tom Exp $
+ * $LynxId: HTList.c,v 1.20 2016/11/24 15:29:50 tom Exp $
  *
  *	A small List class					      HTList.c
  *	==================
@@ -23,8 +23,6 @@ HTList *HTList_new(void)
     if ((newList = typeMalloc(HTList)) == NULL)
 	  outofmem(__FILE__, "HTList_new");
 
-    assert(newList != NULL);
-
     newList->object = NULL;
     newList->next = NULL;
 
@@ -134,8 +132,6 @@ void HTList_addObject(HTList *me, void *newObject)
 	if ((newNode = typeMalloc(HTList)) == NULL)
 	      outofmem(__FILE__, "HTList_addObject");
 
-	assert(newNode != NULL);
-
 	newNode->object = newObject;
 	newNode->next = me->next;
 	me->next = newNode;
@@ -192,8 +188,6 @@ void HTList_insertObjectAt(HTList *me, void *newObject,
 	    if ((newNode = typeMalloc(HTList)) == NULL)
 		  outofmem(__FILE__, "HTList_addObjectAt");
 
-	    assert(newNode != NULL);
-
 	    newNode->object = newObject;
 	    newNode->next = temp;
 	    if (prevNode)
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 6f6391c8..77775660 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.90 2015/12/16 01:13:50 tom Exp $
+ * $LynxId: HTMIME.c,v 1.92 2016/11/24 18:16:23 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -1081,12 +1081,7 @@ static void HTMIME_put_character(HTStream *me, int c)
       begin_transparent:
     case MIME_TRANSPARENT:
 	me->anchor->actual_length += 1;
-	if (me->anchor->content_length == 0 ||
-	    (me->anchor->content_length >= me->anchor->actual_length)) {
-	    (me->targetClass.put_character) (me->target, c);
-	} else {
-	    (me->targetClass.put_character) (me->target, c);
-	}
+	(me->targetClass.put_character) (me->target, c);
 	return;
 
 	/* RFC-2616 describes chunked transfer coding */
@@ -2170,8 +2165,6 @@ HTStream *HTMIMEConvert(HTPresentation *pres,
     if (me == NULL)
 	outofmem(__FILE__, "HTMIMEConvert");
 
-    assert(me != NULL);
-
     me->isa = &HTMIME;
     me->sink = sink;
     me->anchor = anchor;
@@ -2319,8 +2312,6 @@ static void HTmmdec_base64(char **t,
     if ((buf = typeMallocn(char, strlen(s) * 3 + 1)) == 0)
 	  outofmem(__FILE__, "HTmmdec_base64");
 
-    assert(buf != NULL);
-
     for (bp = buf; *s; s += 4) {
 	val = 0;
 	if (s[2] == '=')
@@ -2363,8 +2354,6 @@ static void HTmmdec_quote(char **t,
     if ((buf = typeMallocn(char, strlen(s) + 1)) == 0)
 	  outofmem(__FILE__, "HTmmdec_quote");
 
-    assert(buf != NULL);
-
     for (bp = buf; *s;) {
 	if (*s == '=') {
 	    cval = 0;
@@ -2409,8 +2398,6 @@ void HTmmdecode(char **target,
     if ((buf = typeMallocn(char, strlen(source) + 1)) == 0)
 	  outofmem(__FILE__, "HTmmdecode");
 
-    assert(buf != NULL);
-
     for (s = source, u = buf; *s;) {
 	if (!strncasecomp(s, "=?ISO-2022-JP?B?", 16)) {
 	    base64 = 1;
@@ -2486,8 +2473,6 @@ int HTrjis(char **t,
     if ((buf = typeMallocn(char, strlen(s) * 2 + 1)) == 0)
 	  outofmem(__FILE__, "HTrjis");
 
-    assert(buf != NULL);
-
     for (p = buf; *s;) {
 	if (!kanji && s[0] == '$' && (s[1] == '@' || s[1] == 'B')) {
 	    if (HTmaybekanji((int) s[2], (int) s[3])) {
diff --git a/WWW/Library/Implementation/HTMLGen.c b/WWW/Library/Implementation/HTMLGen.c
index 60d77469..361ad69d 100644
--- a/WWW/Library/Implementation/HTMLGen.c
+++ b/WWW/Library/Implementation/HTMLGen.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMLGen.c,v 1.40 2013/11/28 11:13:46 tom Exp $
+ * $LynxId: HTMLGen.c,v 1.41 2016/11/24 15:29:50 tom Exp $
  *
  *		HTML Generator
  *		==============
@@ -630,8 +630,6 @@ HTStructured *HTMLGenerator(HTStream *output)
     if (me == NULL)
 	outofmem(__FILE__, "HTMLGenerator");
 
-    assert(me != NULL);
-
     me->isa = &HTMLGeneration;
 
     me->target = output;
@@ -715,8 +713,6 @@ HTStream *HTPlainToHTML(HTPresentation *pres GCC_UNUSED,
     if (me == NULL)
 	outofmem(__FILE__, "PlainToHTML");
 
-    assert(me != NULL);
-
     me->isa = (const HTStructuredClass *) &PlainToHTMLConversion;
 
     /*
diff --git a/WWW/Library/Implementation/HTParse.c b/WWW/Library/Implementation/HTParse.c
index 3c1ec7b4..c5d947f8 100644
--- a/WWW/Library/Implementation/HTParse.c
+++ b/WWW/Library/Implementation/HTParse.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTParse.c,v 1.77 2016/11/24 14:32:41 tom Exp $
+ * $LynxId: HTParse.c,v 1.78 2016/11/24 15:29:50 tom Exp $
  *
  *		Parse HyperText Document Address		HTParse.c
  *		================================
@@ -386,8 +386,6 @@ char *HTParse(const char *aName,
     result = tail = (char *) LYalloca(need);
     if (result == NULL) {
 	outofmem(__FILE__, "HTParse");
-
-	assert(result != NULL);
     }
     *result = '\0';
     name = result + len;
@@ -785,8 +783,6 @@ const char *HTParseAnchor(const char *aName)
 
 	    if (name == NULL) {
 		outofmem(__FILE__, "HTParseAnchor");
-
-		assert(name != NULL);
 	    }
 	    strcpy(name, aName);
 	    scan(name, &given);
@@ -1008,8 +1004,6 @@ char *HTRelative(const char *aName,
 	if (result == NULL)
 	    outofmem(__FILE__, "HTRelative");
 
-	assert(result != NULL);
-
 	result[0] = '\0';
 	for (; levels; levels--)
 	    strcat(result, "../");
@@ -1070,8 +1064,6 @@ char *HTEscape(const char *str,
     if (result == NULL)
 	outofmem(__FILE__, "HTEscape");
 
-    assert(result != NULL);
-
     for (q = result, p = str; *p; p++) {
 	unsigned char a = UCH(TOASCII(*p));
 
@@ -1113,8 +1105,6 @@ char *HTEscapeUnsafe(const char *str)
     if (result == NULL)
 	outofmem(__FILE__, "HTEscapeUnsafe");
 
-    assert(result != NULL);
-
     for (q = result, p = str; *p; p++) {
 	unsigned char a = UCH(TOASCII(*p));
 
@@ -1156,8 +1146,6 @@ char *HTEscapeSP(const char *str,
     if (result == NULL)
 	outofmem(__FILE__, "HTEscape");
 
-    assert(result != NULL);
-
     for (q = result, p = str; *p; p++) {
 	unsigned char a = UCH(TOASCII(*p));
 
@@ -1326,8 +1314,6 @@ void HTMake822Word(char **str,
     if (result == NULL)
 	outofmem(__FILE__, "HTMake822Word");
 
-    assert(result != NULL);
-
     q = result;
     if (quoted)
 	*q++ = '"';
diff --git a/WWW/Library/Implementation/HTPlain.c b/WWW/Library/Implementation/HTPlain.c
index 57ca2370..1dc63b48 100644
--- a/WWW/Library/Implementation/HTPlain.c
+++ b/WWW/Library/Implementation/HTPlain.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTPlain.c,v 1.59 2014/12/08 01:11:15 tom Exp $
+ * $LynxId: HTPlain.c,v 1.60 2016/11/24 15:29:50 tom Exp $
  *
  *		Plain text object		HTWrite.c
  *		=================
@@ -577,8 +577,6 @@ HTStream *HTPlainPresent(HTPresentation *pres GCC_UNUSED, HTParentAnchor *anchor
     if (me == NULL)
 	outofmem(__FILE__, "HTPlain_new");
 
-    assert(me != NULL);
-
     me->isa = &HTPlain;
 
     HTPlain_lastraw = -1;
diff --git a/WWW/Library/Implementation/HTRules.c b/WWW/Library/Implementation/HTRules.c
index a9b6e9db..b1e263bb 100644
--- a/WWW/Library/Implementation/HTRules.c
+++ b/WWW/Library/Implementation/HTRules.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTRules.c,v 1.45 2013/11/28 11:14:29 tom Exp $
+ * $LynxId: HTRules.c,v 1.46 2016/11/24 15:29:50 tom Exp $
  *
  *	Configuration manager for Hypertext Daemon		HTRules.c
  *	==========================================
@@ -91,8 +91,6 @@ int HTAddRule(HTRuleOp op, const char *pattern,
     if (temp == NULL)
 	outofmem(__FILE__, "HTAddRule");
 
-    assert(temp != NULL);
-
     if (equiv) {		/* Two operands */
 	char *pEquiv = NULL;
 
diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c
index 3eb94a11..187f1b1b 100644
--- a/WWW/Library/Implementation/HTString.c
+++ b/WWW/Library/Implementation/HTString.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTString.c,v 1.72 2013/11/28 11:14:49 tom Exp $
+ * $LynxId: HTString.c,v 1.73 2016/11/24 15:29:50 tom Exp $
  *
  *	Case-independent string comparison		HTString.c
  *
@@ -306,7 +306,6 @@ char *HTSACopy(char **dest,
 	    *dest = (char *) malloc(size);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACopy");
-	    assert(*dest != NULL);
 	    MemCpy(*dest, src, size);
 	}
     } else {
@@ -327,13 +326,11 @@ char *HTSACat(char **dest,
 	    *dest = (char *) realloc(*dest, length + strlen(src) + 1);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACat");
-	    assert(*dest != NULL);
 	    strcpy(*dest + length, src);
 	} else {
 	    *dest = (char *) malloc(strlen(src) + 1);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACat");
-	    assert(*dest != NULL);
 	    strcpy(*dest, src);
 	}
     }
@@ -367,7 +364,6 @@ char *HTSACopy_extra(char **dest,
 	    *dest = (char *) malloc(size + EXTRA_SIZE);
 	    if (*dest == NULL)
 		outofmem(__FILE__, "HTSACopy_extra");
-	    assert(*dest != NULL);
 	    *(EXTRA_TYPE *) (void *) (*dest) = size;
 	    *dest += EXTRA_SIZE;
 	}
@@ -587,7 +583,6 @@ static char *HTAlloc(char *ptr, size_t length)
 	ptr = (char *) malloc(length);
     if (ptr == 0)
 	outofmem(__FILE__, "HTAlloc");
-    assert(ptr != NULL);
     return ptr;
 }
 
@@ -699,8 +694,6 @@ PUBLIC_IF_FIND_LEAKS char *StrAllocVsprintf(char **pstr,
     if ((fmt_ptr = malloc(need * NUM_WIDTH)) == 0
 	|| (tmp_ptr = malloc(tmp_len)) == 0) {
 	outofmem(__FILE__, "StrAllocVsprintf");
-	assert(fmt_ptr != NULL);
-	assert(tmp_ptr != NULL);
     }
 #endif /* SAVE_TIME_NOT_SPACE */
 
@@ -973,8 +966,6 @@ char *HTQuoteParameter(const char *parameter)
     if (result == NULL)
 	outofmem(__FILE__, "HTQuoteParameter");
 
-    assert(result != NULL);
-
     n = 0;
 #if (USE_QUOTED_PARAMETER == 1)
     /*
@@ -1232,13 +1223,9 @@ void HTSABCopy(bstring **dest, const char *src,
 	if ((t = (bstring *) malloc(sizeof(bstring))) == NULL)
 	      outofmem(__FILE__, "HTSABCopy");
 
-	assert(t != NULL);
-
 	if ((t->str = typeMallocn(char, need)) == NULL)
 	      outofmem(__FILE__, "HTSABCopy");
 
-	assert(t->str != NULL);
-
 	MemCpy(t->str, src, len);
 	t->len = len;
 	t->str[t->len] = '\0';
@@ -1286,15 +1273,11 @@ void HTSABCat(bstring **dest, const char *src,
 	    if ((t = typecalloc(bstring)) == NULL)
 		  outofmem(__FILE__, "HTSACat");
 
-	    assert(t != NULL);
-
 	    t->str = typeMallocn(char, need);
 	}
 	if (t->str == NULL)
 	    outofmem(__FILE__, "HTSACat");
 
-	assert(t->str != NULL);
-
 	MemCpy(t->str + t->len, src, len);
 	t->len += len;
 	t->str[t->len] = '\0';
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index 54491956..c5ceb041 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.135 2016/11/15 09:31:58 tom Exp $
+ * $LynxId: HTTCP.c,v 1.136 2016/11/24 18:06:26 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -1593,6 +1593,7 @@ static void really_getaddrinfo(const char *host,
 	    statuses->h_length = (int) (((LYNX_ADDRINFO *) (*result))->ai_addrlen);
 	}
     }
+    free(res);
 }
 #endif /* NSL_FORK */
 
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 9a5bc2b8..2db68e25 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.161 2016/11/24 12:20:07 tom Exp $
+ * $LynxId: HTTP.c,v 1.162 2016/11/24 18:25:32 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -538,9 +538,7 @@ char *HTSkipToAt(char *host, int *gen_delims)
 
     *gen_delims = 0;
     while ((ch = UCH(*s)) != '\0') {
-	if (ch == '\0') {
-	    break;
-	} else if (ch == ':') {
+	if (ch == ':') {
 	    if (pass++)
 		break;
 	} else if (ch == '@') {
diff --git a/WWW/Library/Implementation/HTWSRC.c b/WWW/Library/Implementation/HTWSRC.c
index 1136da0f..fe42a65b 100644
--- a/WWW/Library/Implementation/HTWSRC.c
+++ b/WWW/Library/Implementation/HTWSRC.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTWSRC.c,v 1.29 2013/05/01 22:32:59 tom Exp $
+ * $LynxId: HTWSRC.c,v 1.30 2016/11/24 15:29:50 tom Exp $
  *
  *			Parse WAIS Source file			HTWSRC.c
  *			======================
@@ -470,8 +470,6 @@ HTStream *HTWSRCConvert(HTPresentation *pres, HTParentAnchor *anchor,
     if (!me)
 	outofmem(__FILE__, "HTWSRCConvert");
 
-    assert(me != NULL);
-
     me->isa = &WSRCParserClass;
     me->target = HTML_new(anchor, pres->rep_out, sink);
 
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 962d794c..47dbc306 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.c,v 1.155 2014/12/10 09:48:35 tom Exp $
+ * $LynxId: SGML.c,v 1.159 2016/11/24 20:08:10 tom Exp $
  *
  *			General SGML Parser code		SGML.c
  *			========================
@@ -19,9 +19,6 @@
 #include <SGML.h>
 #include <HTMLDTD.h>
 #include <HTAccess.h>
-#include <HTCJK.h>		/* FIXME: this doesn't belong in SGML.c */
-#include <UCMap.h>
-#include <UCDefs.h>
 #include <UCAux.h>
 
 #include <HTChunk.h>
@@ -1365,8 +1362,6 @@ static void start_element(HTStream *me)
 	if (N == NULL)
 	    outofmem(__FILE__, "start_element");
 
-	assert(N != NULL);
-
 	N->next = me->element_stack;
 	N->tag = new_tag;
 	me->element_stack = N;
@@ -3214,8 +3209,8 @@ static void SGML_character(HTStream *me, int c_in)
 		HTPassEightBitRaw &&
 		saved_char_in >=
 		LYlowest_eightbit[me->outUCLYhndl]) {
-		HTChunkPutUtf8Char(string,
-				   (UCode_t) (0xf000 | saved_char_in));
+		orig_HTChunkPutUtf8Char(string,
+					(UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
@@ -3624,8 +3619,8 @@ static void SGML_character(HTStream *me, int c_in)
 		HTPassEightBitRaw &&
 		saved_char_in >=
 		LYlowest_eightbit[me->outUCLYhndl]) {
-		HTChunkPutUtf8Char(string,
-				   (UCode_t) (0xf000 | saved_char_in));
+		orig_HTChunkPutUtf8Char(string,
+					(UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
@@ -3664,8 +3659,8 @@ static void SGML_character(HTStream *me, int c_in)
 		HTPassEightBitRaw &&
 		saved_char_in >=
 		LYlowest_eightbit[me->outUCLYhndl]) {
-		HTChunkPutUtf8Char(string,
-				   (UCode_t) (0xf000 | saved_char_in));
+		orig_HTChunkPutUtf8Char(string,
+					(UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
@@ -3708,8 +3703,8 @@ static void SGML_character(HTStream *me, int c_in)
 		HTPassEightBitRaw &&
 		saved_char_in >=
 		LYlowest_eightbit[me->outUCLYhndl]) {
-		HTChunkPutUtf8Char(string,
-				   (UCode_t) (0xf000 | saved_char_in));
+		orig_HTChunkPutUtf8Char(string,
+					(UCode_t) (0xf000 | saved_char_in));
 	    } else {
 		HTChunkPutUtf8Char(string, clong);
 	    }
@@ -4320,8 +4315,6 @@ HTStream *SGML_new(const SGML_dtd * dtd,
     if (!me)
 	outofmem(__FILE__, "SGML_begin");
 
-    assert(me != NULL);
-
     me->isa = &SGMLParser;
     me->string = HTChunkCreate(128);	/* Grow by this much */
     me->dtd = dtd;
@@ -4872,7 +4865,6 @@ void TO_JIS(const unsigned char *arg,
 	outofmem(__FILE__, "TO_JIS");
 #endif
     TO_EUC(arg, euc);
-    is_EUC_JP(euc);
     EUC_TO_JIS(euc, jis, TO_KANJI, TO_ASCII);
 
     free(euc);