about summary refs log tree commit diff stats
path: root/WWW/Library
diff options
context:
space:
mode:
Diffstat (limited to 'WWW/Library')
-rw-r--r--WWW/Library/Implementation/HTGopher.c14
-rw-r--r--WWW/Library/Implementation/HTMIME.c4
-rw-r--r--WWW/Library/Implementation/HTTP.c9
3 files changed, 13 insertions, 14 deletions
diff --git a/WWW/Library/Implementation/HTGopher.c b/WWW/Library/Implementation/HTGopher.c
index 665006a4..30577a9d 100644
--- a/WWW/Library/Implementation/HTGopher.c
+++ b/WWW/Library/Implementation/HTGopher.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTGopher.c,v 1.61 2013/11/28 11:12:32 tom Exp $
+ * $LynxId: HTGopher.c,v 1.62 2015/12/16 01:17:53 tom Exp $
  *
  *			GOPHER ACCESS				HTGopher.c
  *			=============
@@ -1227,7 +1227,7 @@ static int generate_cso_report(HTStream *Target)
     char line[BIG];
     char *buf = 0;
     char *p = line, *href = NULL;
-    int len, i, prev_ndx, ndx;
+    int i, prev_ndx, ndx;
     char *rcode, *ndx_str, *fname, *fvalue, *l;
     CSOfield_info *fld;
     BOOL stop = FALSE;
@@ -1263,16 +1263,14 @@ static int generate_cso_report(HTStream *Target)
 	    }
 	    rcode = (p[0] == '-') ? &p[1] : p;
 	    ndx_str = fname = NULL;
-	    len = (int) strlen(p);
-	    for (i = 0; i < len; i++) {
+	    for (i = 0; p[i] != '\0'; i++) {
 		if (p[i] == ':') {
 		    p[i] = '\0';
-		    if (!ndx_str) {
-			fname = ndx_str = &p[i + 1];
-		    } else {
-			fname = &p[i + 1];
+		    fname = &p[i + 1];
+		    if (ndx_str) {
 			break;
 		    }
+		    ndx_str = fname;
 		}
 	    }
 	    if (ndx_str) {
diff --git a/WWW/Library/Implementation/HTMIME.c b/WWW/Library/Implementation/HTMIME.c
index 94dd7fbf..6f6391c8 100644
--- a/WWW/Library/Implementation/HTMIME.c
+++ b/WWW/Library/Implementation/HTMIME.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTMIME.c,v 1.89 2014/07/24 22:08:24 tom Exp $
+ * $LynxId: HTMIME.c,v 1.90 2015/12/16 01:13:50 tom Exp $
  *
  *			MIME Message Parse			HTMIME.c
  *			==================
@@ -2449,7 +2449,7 @@ void HTmmdecode(char **target,
 		HTmmdec_base64(&m2buf, mmbuf);
 	    else
 		HTmmdec_quote(&m2buf, mmbuf);
-	    for (t = m2buf; *t;)
+	    for (t = m2buf; non_empty(t);)
 		*u++ = *t++;
 	    HTmmcont = 1;
 	} else {
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index 57263f44..30edc891 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.147 2015/11/17 01:29:09 tom Exp $
+ * $LynxId: HTTP.c,v 1.148 2015/12/16 01:54:03 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -877,9 +877,10 @@ static int HTLoadHTTP(const char *arg,
 				  gettext("GnuTLS error when trying to verify certificate."));
 	    } else {
 		type = gnutls_certificate_type_get(handle->gnutls_state);
-		ret = gnutls_certificate_verification_status_print(tls_status,
-								   type, &out, 0);
-		SSL_single_prompt(&msg, out.data);
+		(void) gnutls_certificate_verification_status_print(tls_status,
+								    type,
+								    &out, 0);
+		SSL_single_prompt(&msg, (const char *) out.data);
 		gnutls_free(out.data);
 	    }
 #else