snapshot of project "lynx", label v2-8-8dev_6b

6 files changed, 19 insertions, 17 deletions

diff --git a/WWW/Library/Implementation/HTFormat.c b/WWW/Library/Implementation/HTFormat.c
index 798dbec7..2299efaf 100644
--- a/WWW/Library/Implementation/HTFormat.c
+++ b/WWW/Library/Implementation/HTFormat.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTFormat.c,v 1.72 2010/09/24 09:11:25 tom Exp $
+ * $LynxId: HTFormat.c,v 1.73 2010/11/07 21:20:56 tom Exp $
  *
  *		Manage different file formats			HTFormat.c
  *		=============================
@@ -1089,7 +1089,7 @@ static int HTGzFileCopy(gzFile gzfp, HTStream *sink)
 
 	(*targetClass.put_block) (sink, input_buffer, status);
 	bytes += status;
-	HTReadProgress(bytes, (off_t) - 1);
+	HTReadProgress(bytes, (off_t) -1);
 	HTDisplayPartial();
 
 	if (HTCheckForInterrupt()) {
@@ -1191,7 +1191,7 @@ static int HTZzFileCopy(FILE *zzfp, HTStream *sink)
 	    if (len > 0) {
 		(*targetClass.put_block) (sink, output_buffer, len);
 		bytes += len;
-		HTReadProgress(bytes, (off_t) - 1);
+		HTReadProgress(bytes, (off_t) -1);
 		HTDisplayPartial();
 	    }
 	    rv = HT_LOADED;
@@ -1220,7 +1220,7 @@ static int HTZzFileCopy(FILE *zzfp, HTStream *sink)
 
 	    (*targetClass.put_block) (sink, output_buffer, len);
 	    bytes += len;
-	    HTReadProgress(bytes, (off_t) - 1);
+	    HTReadProgress(bytes, (off_t) -1);
 	    HTDisplayPartial();
 
 	    if (HTCheckForInterrupt()) {
@@ -1295,7 +1295,7 @@ static int HTBzFileCopy(BZFILE * bzfp, HTStream *sink)
 
 	(*targetClass.put_block) (sink, input_buffer, status);
 	bytes += status;
-	HTReadProgress(bytes, (off_t) - 1);
+	HTReadProgress(bytes, (off_t) -1);
 	HTDisplayPartial();
 
 	if (HTCheckForInterrupt()) {
diff --git a/WWW/Library/Implementation/HTString.c b/WWW/Library/Implementation/HTString.c
index c3ee43c2..ba332206 100644
--- a/WWW/Library/Implementation/HTString.c
+++ b/WWW/Library/Implementation/HTString.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTString.c,v 1.64 2010/09/25 11:32:30 tom Exp $
+ * $LynxId: HTString.c,v 1.65 2010/11/07 21:20:58 tom Exp $
  *
  *	Case-independent string comparison		HTString.c
  *
@@ -777,6 +777,7 @@ PUBLIC_IF_FIND_LEAKS char *StrAllocVsprintf(char **pstr,
 
 			else if (type == 'Z')
 			    VA_INTGR(size_t);
+
 			else
 			    VA_INTGR(int);
 
diff --git a/WWW/Library/Implementation/HTTCP.c b/WWW/Library/Implementation/HTTCP.c
index d85f2d35..d366d732 100644
--- a/WWW/Library/Implementation/HTTCP.c
+++ b/WWW/Library/Implementation/HTTCP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTCP.c,v 1.105 2010/10/27 00:11:11 tom Exp $
+ * $LynxId: HTTCP.c,v 1.106 2010/11/07 21:20:58 tom Exp $
  *
  *			Generic Communication Code		HTTCP.c
  *			==========================
@@ -2102,7 +2102,7 @@ int HTDoRead(int fildes,
 #ifdef USE_READPROGRESS
     CTRACE2(TRACE_TIMING, (tfp, "...HTDoRead returns %d (%" PRI_time_t
 			   " seconds)\n",
-			   result, CAST_time_t(time((time_t *) 0) - start)));
+			   result, CAST_time_t (time((time_t *)0) - start)));
 #endif
     return result;
 }
diff --git a/WWW/Library/Implementation/HTTP.c b/WWW/Library/Implementation/HTTP.c
index ff898adb..7ca3c1b9 100644
--- a/WWW/Library/Implementation/HTTP.c
+++ b/WWW/Library/Implementation/HTTP.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: HTTP.c,v 1.120 2010/09/25 11:31:46 tom Exp $
+ * $LynxId: HTTP.c,v 1.121 2010/11/07 21:20:58 tom Exp $
  *
  * HyperText Tranfer Protocol	- Client implementation		HTTP.c
  * ==========================
@@ -170,6 +170,7 @@ void HTSSLInitPRNG(void)
 	}
 	/* Seed in time (mod_ssl does this) */
 	RAND_seed((unsigned char *) &t, (int) sizeof(time_t));
+
 	/* Seed in pid (mod_ssl does this) */
 	RAND_seed((unsigned char *) &pid, (int) sizeof(pid));
 	/* Initialize system's random number generator */
@@ -1048,12 +1049,12 @@ static int HTLoadHTTP(const char *arg,
 		if (pres->quality < 1.0) {
 		    if (pres->maxbytes > 0) {
 			sprintf(temp, ";q=%4.3f;mxb=%" PRI_off_t "",
-				pres->quality, CAST_off_t(pres->maxbytes));
+				pres->quality, CAST_off_t (pres->maxbytes));
 		    } else {
 			sprintf(temp, ";q=%4.3f", pres->quality);
 		    }
 		} else if (pres->maxbytes > 0) {
-		    sprintf(temp, ";mxb=%" PRI_off_t "", CAST_off_t(pres->maxbytes));
+		    sprintf(temp, ";mxb=%" PRI_off_t "", CAST_off_t (pres->maxbytes));
 		} else {
 		    temp[0] = '\0';
 		}
diff --git a/WWW/Library/Implementation/SGML.c b/WWW/Library/Implementation/SGML.c
index 0b1edebc..611490bd 100644
--- a/WWW/Library/Implementation/SGML.c
+++ b/WWW/Library/Implementation/SGML.c
@@ -1,5 +1,5 @@
 /*
- * $LynxId: SGML.c,v 1.140 2010/10/04 00:04:12 tom Exp $
+ * $LynxId: SGML.c,v 1.141 2010/11/07 21:20:59 tom Exp $
  *
  *			General SGML Parser code		SGML.c
  *			========================
@@ -2153,7 +2153,7 @@ static void SGML_character(HTStream *context, int c_in)
 		   uck < 256) {
 	    CTRACE((tfp, "UCTransUniChar returned 0x%.2" PRI_UCode_t
 		    ":'%c'.\n",
-		    uck, FROMASCII((char) uck)));
+		    uck, FROMASCII((char)uck)));
 	    /*
 	     * We got one octet from the conversions, so use it.  - FM
 	     */
diff --git a/WWW/Library/Implementation/UCAux.h b/WWW/Library/Implementation/UCAux.h
index f89609be..e0b93e60 100644
--- a/WWW/Library/Implementation/UCAux.h
+++ b/WWW/Library/Implementation/UCAux.h
@@ -1,5 +1,5 @@
 /*
- * $LynxId: UCAux.h,v 1.17 2010/09/24 00:14:04 tom Exp $
+ * $LynxId: UCAux.h,v 1.18 2010/11/07 21:20:59 tom Exp $
  */
 #ifndef UCAUX_H
 #define UCAUX_H
@@ -59,11 +59,11 @@ extern "C" {
 			      int vert_in,
 			      int hori_in);
 
-    typedef void putc_func_t(HTStream *me,
-			     int ch);
+    typedef void putc_func_t (HTStream *me,
+			      int ch);
 
     extern BOOL UCPutUtf8_charstring(HTStream *target,
-				     putc_func_t * actions,
+				     putc_func_t *actions,
 				     UCode_t code);
 
     extern BOOL UCConvertUniToUtf8(UCode_t code,