snapshot of project "lynx", label v2-8-1dev_9

7 files changed, 20 insertions, 18 deletions

diff --git a/WWW/Library/Implementation/HTAccess.c b/WWW/Library/Implementation/HTAccess.c
index 4eea11b9..0380bd9e 100644
--- a/WWW/Library/Implementation/HTAccess.c
+++ b/WWW/Library/Implementation/HTAccess.c
@@ -1231,16 +1231,16 @@ PUBLIC BOOL HTSearch ARGS2(
 **	the new address.
 **
 **  On Entry,
-**	 *keywords	space-separated keyword list or similar search list
-**	*addres 	is name of object search is to be done on.
+**	*keywords	space-separated keyword list or similar search list
+**	*indexname	is name of object search is to be done on.
 */
 PUBLIC BOOL HTSearchAbsolute ARGS2(
 	CONST char *,	keywords,
-	CONST char *,	indexname)
+	char *,		indexname)
 {
     DocAddress abs_doc;
     HTParentAnchor * anchor;
-    abs_doc.address = (char *)indexname;
+    abs_doc.address = indexname;
     abs_doc.post_data = NULL;
     abs_doc.post_content_type = NULL;
     abs_doc.bookmark = NULL;
diff --git a/WWW/Library/Implementation/HTAccess.h b/WWW/Library/Implementation/HTAccess.h
index 1954e6de..b168dfba 100644
--- a/WWW/Library/Implementation/HTAccess.h
+++ b/WWW/Library/Implementation/HTAccess.h
@@ -263,7 +263,7 @@ Search Given Indexname
  */
 extern BOOL HTSearchAbsolute PARAMS((
         CONST char *    keywords,
-        CONST char *    indexname));
+        char *    	indexname));
 
 
 /*
diff --git a/WWW/Library/Implementation/HTFTP.c b/WWW/Library/Implementation/HTFTP.c
index 0c83e42d..1970b03d 100644
--- a/WWW/Library/Implementation/HTFTP.c
+++ b/WWW/Library/Implementation/HTFTP.c
@@ -265,14 +265,15 @@ PUBLIC char * HTMake_VMS_name ARGS2(
     strcpy(nodename, "");	/* On same node? Yes if node names match */
     if (strncmp(nn, "localhost", 9)) {
 	CONST char *p;
-	char *q;
-	for (p = hostname, q = (char *)nn;
+	CONST char *q;
+	for (p = hostname, q = nn;
 	     *p && *p != '.' && *q && *q != '.'; p++, q++){
 	    if (TOUPPER(*p) != TOUPPER(*q)) {
+		char *r;
 		strcpy(nodename, nn);
-		q = strchr(nodename, '.');	/* Mismatch */
-		if (q)
-		    *q = '\0';			/* Chop domain */
+		r = strchr(nodename, '.');	/* Mismatch */
+		if (r)
+		    *r = '\0';			/* Chop domain */
 		strcat(nodename, "::"); 	/* Try decnet anyway */
 		break;
 	    }
@@ -1402,7 +1403,8 @@ PRIVATE void parse_vms_dir_entry ARGS2(
 	char *, 	line,
 	EntryInfo *,	entry_info)
 {
-    int i, j, ialloc;
+    int i, j;
+    unsigned int ialloc;
     char *cp, *cpd, *cps, date[16], *sp = " ";
 
     /**  Get rid of blank lines, and information lines.  **/
diff --git a/WWW/Library/Implementation/HTMLDTD.c b/WWW/Library/Implementation/HTMLDTD.c
index 4b0049d6..4e83e029 100644
--- a/WWW/Library/Implementation/HTMLDTD.c
+++ b/WWW/Library/Implementation/HTMLDTD.c
@@ -1606,7 +1606,7 @@ PUBLIC void HTSwitchDTD ARGS1(
 	memcpy(tags, tags_old, HTML_ELEMENTS * sizeof(HTTag));
 }
 
-PUBLIC CONST HTTag HTTag_unrecognized =
+PUBLIC HTTag HTTag_unrecognized =
     { NULL,    NULL,		0,	SGML_EMPTY,T__UNREC_};
 
 /*
diff --git a/WWW/Library/Implementation/HTMLDTD.h b/WWW/Library/Implementation/HTMLDTD.h
index 07ce5195..87c2bb76 100644
--- a/WWW/Library/Implementation/HTMLDTD.h
+++ b/WWW/Library/Implementation/HTMLDTD.h
@@ -956,7 +956,7 @@ extern CONST SGML_dtd HTML_dtd;
 extern void HTSwitchDTD PARAMS((
     BOOL new));
 
-extern CONST HTTag HTTag_unrecognized;
+extern HTTag HTTag_unrecognized;
 
 /*
 
diff --git a/WWW/Library/Implementation/HTPasswd.c b/WWW/Library/Implementation/HTPasswd.c
index f8494417..27efb02f 100644
--- a/WWW/Library/Implementation/HTPasswd.c
+++ b/WWW/Library/Implementation/HTPasswd.c
@@ -138,7 +138,7 @@ PUBLIC BOOL HTAA_passwdMatch ARGS2(CONST char *, password,
 				   CONST char *, encrypted)
 {
     char *result;
-    int len;
+    size_t len;
     int status;
 
     if (!password || !encrypted)
@@ -152,7 +152,7 @@ PUBLIC BOOL HTAA_passwdMatch ARGS2(CONST char *, password,
 	outofmem(__FILE__, "HTAA_encryptPasswd");
 
     *result = (char)0;
-    while (len > 0) {
+    while (len != 0) {
 	char salt[3];
 	char chunk[9];
 	CONST char *cur1 = password;
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 15fc070c..9c2323cc 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -74,7 +74,7 @@ struct _HTStream {
     CONST HTStreamClass *	isa;		/* inherited from HTStream */
 
     CONST SGML_dtd		*dtd;
-    HTStructuredClass		*actions;	/* target class  */
+    CONST HTStructuredClass	*actions;	/* target class  */
     HTStructured		*target;	/* target object */
 
     HTTag			*current_tag;
@@ -1034,7 +1034,7 @@ PUBLIC HTTag * SGMLFindTag ARGS2(
 	/*
 	**  Unrecognized, but may be valid. - KW
 	*/
-	return (HTTag *)&HTTag_unrecognized;
+	return &HTTag_unrecognized;
     }
     return NULL;
 }
@@ -3142,7 +3142,7 @@ PUBLIC HTStream* SGML_new  ARGS3(
     context->string = HTChunkCreate(128);	/* Grow by this much */
     context->dtd = dtd;
     context->target = target;
-    context->actions = (HTStructuredClass*)(((HTStream*)target)->isa);
+    context->actions = (CONST HTStructuredClass*)(((HTStream*)target)->isa);
 					/* Ugh: no OO */
     context->unknown_tag = &HTTag_unrecognized;
     context->state = S_text;