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

5 files changed, 17 insertions, 14 deletions

diff --git a/src/GridText.c b/src/GridText.c
index b05aaf2f..810a38d2 100644
--- a/src/GridText.c
+++ b/src/GridText.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: GridText.c,v 1.286 2014/12/16 01:23:52 tom Exp $
+ * $LynxId: GridText.c,v 1.287 2015/12/16 01:20:01 tom Exp $
  *
  *		Character grid hypertext object
  *		===============================
@@ -8226,7 +8226,6 @@ void print_wwwfile_to_fd(FILE *fp,
 
 		if (off2 >= 0 && off2 < cur->length) {
 		    temp_ptr = &(cur->value[off2]);
-		    temp_len = 1;
 		    try_utf8 = temp_ptr;
 		    temp_chr = (int) UCGetUniFromUtf8String(&try_utf8);
 		    if (temp_chr > 127) {
diff --git a/src/LYHistory.c b/src/LYHistory.c
index 016fe7be..3f13bbd6 100644
--- a/src/LYHistory.c
+++ b/src/LYHistory.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: LYHistory.c,v 1.86 2013/10/19 00:46:43 tom Exp $
+ * $LynxId: LYHistory.c,v 1.87 2015/12/16 01:45:14 tom Exp $
  */
 #include <HTUtils.h>
 #include <HTTP.h>
@@ -627,7 +627,7 @@ int LYhist_next(DocInfo *doc, DocInfo *newdoc)
 void LYpop_num(int number,
 	       DocInfo *doc)
 {
-    if (number >= 0 && nhist + nhist_extra > number) {
+    if (number >= 0 && (nhist + nhist_extra) > number) {
 	doc->link = HDOC(number).link;
 	doc->line = HDOC(number).line;
 	StrAllocCopy(doc->title, HDOC(number).title);
diff --git a/src/LYOptions.c b/src/LYOptions.c
index 76815bb2..ff27cb8f 100644
--- a/src/LYOptions.c
+++ b/src/LYOptions.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYOptions.c,v 1.166 2015/10/08 08:52:00 Simon.Kainz Exp $ */
+/* $LynxId: LYOptions.c,v 1.167 2015/12/16 01:51:08 tom Exp $ */
 #include <HTUtils.h>
 #include <HTFTP.h>
 #include <HTTP.h>		/* 'reloading' flag */
@@ -1593,9 +1593,13 @@ static int widest_choice(STRING2PTR choices)
 static void show_choice(const char *choice,
 			int width)
 {
-    int len = (int) strlen(choice);
+    int len = 0;
 
-    LYaddstr(choice);
+    if (choice != 0) {
+	len = (int) strlen(choice);
+
+	LYaddstr(choice);
+    }
     while (len++ < width)
 	LYaddch(' ');
 }
diff --git a/src/LYStrings.c b/src/LYStrings.c
index 8c716fa2..b9411f87 100644
--- a/src/LYStrings.c
+++ b/src/LYStrings.c
@@ -1,4 +1,4 @@
-/* $LynxId: LYStrings.c,v 1.262 2015/12/14 09:52:43 tom Exp $ */
+/* $LynxId: LYStrings.c,v 1.263 2015/12/16 01:18:53 tom Exp $ */
 #include <HTUtils.h>
 #include <HTCJK.h>
 #include <UCAux.h>
@@ -5149,7 +5149,7 @@ int LYgetBString(bstring **inputline,
 	    LYFinishEdit(edit);
 	    result = ch;
 	    done = TRUE;
-	    break;
+	    continue;
 	}
 	ch |= InputMods;
 	InputMods = 0;
@@ -5238,7 +5238,7 @@ int LYgetBString(bstring **inputline,
 	    LYFinishEdit(edit);
 	    result = ch;
 	    done = TRUE;
-	    break;
+	    continue;
 
 #ifdef CAN_CUT_AND_PASTE
 	case LYE_PASTE:
@@ -5291,7 +5291,7 @@ int LYgetBString(bstring **inputline,
 	    LYFinishEdit(edit);
 	    BStrCopy0(*inputline, "");
 	    done = TRUE;
-	    break;
+	    continue;
 
 	case LYE_STOP:
 	    CTRACE((tfp, "LYgetstr LYE_STOP\n"));
@@ -5300,7 +5300,7 @@ int LYgetBString(bstring **inputline,
 	    LYFinishEdit(edit);
 	    BStrCopy0(*inputline, "");
 	    done = TRUE;
-	    break;
+	    continue;
 #else
 #ifdef ENHANCED_LINEEDIT
 	    disableEditMark();
diff --git a/src/tidy_tls.c b/src/tidy_tls.c
index 012c25d8..af5d07d5 100644
--- a/src/tidy_tls.c
+++ b/src/tidy_tls.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: tidy_tls.c,v 1.32 2015/12/15 01:41:06 tom Exp $
+ * $LynxId: tidy_tls.c,v 1.33 2015/12/16 01:23:11 tom Exp $
  * Copyright 2008-2014,2015 Thomas E. Dickey
  * with fix Copyright 2008 by Thomas Viehmann
  *
@@ -461,7 +461,7 @@ int SSL_read(SSL * ssl, void *buffer, int length)
 
     if (rc < 0 && gnutls_error_is_fatal(rc) == 0) {
 	if (rc == GNUTLS_E_REHANDSHAKE) {
-	    rc = gnutls_handshake(ssl->gnutls_state);
+	    (void) gnutls_handshake(ssl->gnutls_state);
 	    gnutls_record_send(ssl->gnutls_state, ssl->sendbuffer, (size_t) ssl->bytes_sent);
 	    rc = (int) gnutls_record_recv(ssl->gnutls_state, buffer, (size_t) length);
 	}