head	1.2;
access;
symbols;
locks; strict;
comment	@# @;


1.2
date	2001.03.20.22.20.33;	author sf;	state dead;
branches;
next	1.1;

1.1
date	2000.12.10.16.05.18;	author roam;	state Exp;
branches;
next	;


desc
@@


1.2
log
@update to 0.1.11 + hsaka patchlevel 24.

PR:		25952
Submitted by:	maintainer
@
text
@diff -Nru --exclude config.h --exclude XXMakefile --exclude tagtable.c ../w3m-0.1.11-pre/etc.c ./etc.c
--- ../w3m-0.1.11-pre/etc.c	Fri Dec  8 01:14:57 2000
+++ ./etc.c	Fri Dec  8 01:28:24 2000
@@@@ -277,7 +277,7 @@@@
     int do_copy = FALSE;
     int size = (len < s->length) ? len : s->length;
 
-    if (ShowEffect && (bs = memchr(str, '\b', s->length)) ||
+    if ((ShowEffect && (bs = memchr(str, '\b', s->length))) ||
 	s->length > size) {
 	s = Strnew_size(size);
 	do_copy = TRUE;
diff -Nru --exclude config.h --exclude XXMakefile --exclude tagtable.c ../w3m-0.1.11-pre/file.c ./file.c
--- ../w3m-0.1.11-pre/file.c	Fri Dec  8 01:15:31 2000
+++ ./file.c	Fri Dec  8 01:27:33 2000
@@@@ -230,8 +230,8 @@@@
 static int
 is_plain_text_type(char *type)
 {
-    return (type && strcasecmp(type, "text/plain") == 0 ||
-	    is_text_type(type) && !is_dump_text_type(type));
+    return (type && (strcasecmp(type, "text/plain") == 0 ||
+		     (is_text_type(type) && !is_dump_text_type(type))));
 }
 
 static void
@@@@ -326,7 +326,7 @@@@
 		uf->guess_type = "text/plain";
 	    if (strcasecmp(uf->guess_type, "text/html") == 0)
 		return;
-	    if (fp = lessopen_stream(path)) {
+	    if ((fp = lessopen_stream(path)) != NULL) {
 		UFclose(uf);
 		uf->stream = newFileStream(fp, (void (*)()) pclose);
 		uf->guess_type = "text/plain";
@@@@ -3479,6 +3479,7 @@@@
 		s = Sprintf("<A HREF=\"%s\">applet archive(%s)</A>", q, q);
 		HTMLlineproc1(s->ptr, h_env);
 	    }
+	}
 	return 1;
 #endif				/* VIEW_UNSEENOBJECTS */
     case HTML_BODY:
@@@@ -4162,12 +4163,12 @@@@
 		return;
 	    }
 	    q = h_env->tagbuf->ptr;
-	    if (tag = parse_tag(&q, internal))
+	    if ((tag = parse_tag(&q, internal)) != NULL)
 		cmd = tag->tagid;
 	    else
 		cmd = HTML_UNKNOWN;
-	    if (obuf->flag & RB_XMPMODE && cmd != HTML_N_XMP ||
-		obuf->flag & RB_LSTMODE && cmd != HTML_N_LISTING) {
+	    if (((obuf->flag & RB_XMPMODE) && cmd != HTML_N_XMP) ||
+		((obuf->flag & RB_LSTMODE) && cmd != HTML_N_LISTING)) {
 		Str tmp = Strdup(h_env->tagbuf);
 		Strcat_charp(tmp, str);
 		str = tmp->ptr;
diff -Nru --exclude config.h --exclude XXMakefile --exclude tagtable.c ../w3m-0.1.11-pre/istream.c ./istream.c
--- ../w3m-0.1.11-pre/istream.c	Fri Dec  8 01:14:47 2000
+++ ./istream.c	Fri Dec  8 01:32:01 2000
@@@@ -193,7 +193,7 @@@@
 	    do_update(base);
 	}
 	else {
-	    if (p = memchr(&sb->buf[sb->cur], '\n', sb->next - sb->cur)) {
+	    if ((p = memchr(&sb->buf[sb->cur], '\n', sb->next - sb->cur)) != NULL) {
 		len = p - &sb->buf[sb->cur] + 1;
 		if (s == NULL)
 		    s = Strnew_size(len);
diff -Nru --exclude config.h --exclude XXMakefile --exclude tagtable.c ../w3m-0.1.11-pre/mailcap.c ./mailcap.c
--- ../w3m-0.1.11-pre/mailcap.c	Fri Dec  8 01:14:57 2000
+++ ./mailcap.c	Fri Dec  8 01:30:13 2000
@@@@ -242,7 +242,7 @@@@
 	goto no_user_mailcap;
     
     for (i = 0; i < mailcap_list->nitem; i++) {
-	if (p = searchMailcap(UserMailcap[i], type))
+	if ((p = searchMailcap(UserMailcap[i], type)) != NULL)
 	    return p;
     }
 
diff -Nru --exclude config.h --exclude XXMakefile --exclude tagtable.c ../w3m-0.1.11-pre/parsetagx.c ./parsetagx.c
--- ../w3m-0.1.11-pre/parsetagx.c	Fri Dec  8 01:14:57 2000
+++ ./parsetagx.c	Fri Dec  8 01:31:27 2000
@@@@ -118,8 +118,8 @@@@
 
     tag_id = getHash_si(&tagtable, tagname, HTML_UNKNOWN);
 
-    if (tag_id == HTML_UNKNOWN ||
-	!internal && TagMAP[tag_id].flag & TFLG_INT)
+    if ((tag_id == HTML_UNKNOWN) ||
+	(!internal && (TagMAP[tag_id].flag & TFLG_INT)))
 	goto skip_parse_tagarg;
 
     tag = New(struct parsed_tag);
@@@@ -189,9 +189,9 @@@@
 	}
 	if (i != nattr) {
 	    if (!internal &&
-		(AttrMAP[attr_id].flag & AFLG_INT ||
-		 value && AttrMAP[attr_id].vtype == VTYPE_METHOD &&
-		 !strcasecmp(value->ptr, "internal"))) {
+		((AttrMAP[attr_id].flag & AFLG_INT) ||
+		 (value && AttrMAP[attr_id].vtype == VTYPE_METHOD &&
+		  !strcasecmp(value->ptr, "internal")))) {
 		tag->need_reconstruct = TRUE;
 		continue;
 	    }
diff -Nru --exclude config.h --exclude XXMakefile --exclude tagtable.c ../w3m-0.1.11-pre/table.c ./table.c
--- ../w3m-0.1.11-pre/table.c	Fri Dec  8 01:14:57 2000
+++ ./table.c	Fri Dec  8 01:29:24 2000
@@@@ -758,7 +758,7 @@@@
 	    int id = -1;
 	    char *p = l->ptr;
 	    struct parsed_tag *tag;
-	    if (tag = parse_tag(&p, TRUE))
+	    if ((tag = parse_tag(&p, TRUE)) != NULL)
 		parsedtag_get_value(tag, ATTR_TID, &id);
 	    if (id >= 0 && id < tbl->ntable) {
 		int alignment;
@@@@ -1199,8 +1199,8 @@@@
     if (dmax > 0. && dmin > dmax)
 	dmin = dmax;
     span = ecol - bcol;
-    if (span == t->maxcol + 1 && dmin >= 0. ||
-	span != t->maxcol + 1 && dmin > rulewidth * 0.5) {
+    if ((span == t->maxcol + 1 && dmin >= 0.) ||
+	(span != t->maxcol + 1 && dmin > rulewidth * 0.5)) {
 	int nwidth = ceil_at_intervals(round(owidth - dmin), rulewidth);
 	correct_table_matrix(t, bcol, ecol - bcol, nwidth, 1.);
 	corr++;
@@@@ -2425,11 +2425,11 @@@@
 
     if (
 #ifdef MENU_SELECT
-	mode->pre_mode & TBLM_INSELECT && cmd != HTML_N_SELECT ||
+	(mode->pre_mode & TBLM_INSELECT && cmd != HTML_N_SELECT) ||
 #endif				/* MENU_SELECT */
-	mode->pre_mode & TBLM_INTXTA && cmd != HTML_N_TEXTAREA ||
-	mode->pre_mode & TBLM_XMP && cmd != HTML_N_XMP ||
-	mode->pre_mode & TBLM_LST && cmd != HTML_N_LISTING)
+	(mode->pre_mode & TBLM_INTXTA && cmd != HTML_N_TEXTAREA) ||
+	(mode->pre_mode & TBLM_XMP && cmd != HTML_N_XMP) ||
+	(mode->pre_mode & TBLM_LST && cmd != HTML_N_LISTING))
 	return TAG_ACTION_FEED;
 	
     if (mode->pre_mode & TBLM_PRE) {
diff -Nru --exclude config.h --exclude XXMakefile --exclude tagtable.c ../w3m-0.1.11-pre/url.c ./url.c
--- ../w3m-0.1.11-pre/url.c	Fri Dec  8 01:14:57 2000
+++ ./url.c	Fri Dec  8 01:30:29 2000
@@@@ -1502,7 +1502,7 @@@@
 	goto no_user_mimetypes;
 
     for (i = 0; i < mimetypes_list->nitem; i++) {
-	if (ret = guessContentTypeFromTable(UserMimeTypes[i], filename))
+	if ((ret = guessContentTypeFromTable(UserMimeTypes[i], filename)) != NULL)
 	    return ret;
     }
@


1.1
log
@Update to 0.1.11-pre + kokb patchlevel 23

PR:		23393
Submitted by:	maintainer
@
text
@@

