[w3m-dev 03660] Re: fputs -> Strfputs

* Str.h (Strncmp_charp): paren
	(Strncasecmp_charp): ditto
	(Strinsert): ditto
	(Strshrinkfirst): ditto
* display.c (disp_err_message): added
* file.c (loadGeneralFile): don't put function in macro arg
	(saveBuffer): ditto
* frame.c (createFrameFile): ditto
* proto.h (disp_err_message): macro->function
* table.c (pushdata): if data is NULL, use ""
	(suspend_or_pushdata): if line is NULL, use ""
* textlist.h (pushText): don't use (s) twice in a macro
From: Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>

8 files changed, 44 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index c45d99e..e6e00c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
 2003-01-21  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
 
+	* [w3m-dev 03660] Re: fputs -> Strfputs
+	* Str.h (Strncmp_charp): paren
+		(Strncasecmp_charp): ditto
+		(Strinsert): ditto
+		(Strshrinkfirst): ditto
+	* display.c (disp_err_message): added
+	* file.c (loadGeneralFile): don't put function in macro arg
+		(saveBuffer): ditto
+	* frame.c (createFrameFile): ditto
+	* proto.h (disp_err_message): macro->function
+	* table.c (pushdata): if data is NULL, use ""
+		(suspend_or_pushdata): if line is NULL, use ""
+	* textlist.h (pushText): don't use (s) twice in a macro
+
+2003-01-21  Hironori SAKAMOTO <hsaka@mth.biglobe.ne.jp>
+
 	* [w3m-dev 03659] Can't download from SSL.
 	* istream.c (ISfileno): case IST_SSL
 
@@ -6626,4 +6642,4 @@ a	* [w3m-dev 03276] compile error on EWS4800
 	* release-0-2-1
 	* import w3m-0.2.1
 
-$Id: ChangeLog,v 1.695 2003/01/20 15:25:29 ukai Exp $
+$Id: ChangeLog,v 1.696 2003/01/20 15:30:18 ukai Exp $
diff --git a/Str.h b/Str.h
index 74c00c4..af0b2de 100644
--- a/Str.h
+++ b/Str.h
@@ -1,4 +1,4 @@
-/* $Id: Str.h,v 1.4 2001/11/24 02:01:26 ukai Exp $ */
+/* $Id: Str.h,v 1.5 2003/01/20 15:30:19 ukai Exp $ */
 /* 
  * String manipulation library for Boehm GC
  *
@@ -70,14 +70,14 @@ void Strgrow(Str s);
 #define Strcmp(x,y)                  strcmp((x)->ptr,(y)->ptr)
 #define Strcmp_charp(x,y)            strcmp((x)->ptr,(y))
 #define Strncmp(x,y,n)               strncmp((x)->ptr,(y)->ptr,(n))
-#define Strncmp_charp(x,y,n)         strncmp((x)->ptr,y,(n))
+#define Strncmp_charp(x,y,n)         strncmp((x)->ptr,(y),(n))
 #define Strcasecmp(x,y)              strcasecmp((x)->ptr,(y)->ptr)
 #define Strcasecmp_charp(x,y)        strcasecmp((x)->ptr,(y))
 #define Strncasecmp(x,y,n)           strncasecmp((x)->ptr,(y)->ptr,(n))
-#define Strncasecmp_charp(x,y,n)     strncasecmp((x)->ptr,y,(n))
+#define Strncasecmp_charp(x,y,n)     strncasecmp((x)->ptr,(y),(n))
 
 #define Strlastchar(s)               ((s)->length>0?(s)->ptr[(s)->length-1]:'\0')
-#define Strinsert(s,n,p)             Strinsert_charp(s,n,(p)->ptr)
-#define Strshrinkfirst(s,n)          Strdelete(s,0,n)
+#define Strinsert(s,n,p)             Strinsert_charp((s),(n),(p)->ptr)
+#define Strshrinkfirst(s,n)          Strdelete((s),0,(n))
 #define Strfputs(s,f)                fwrite((s)->ptr,1,(s)->length,(f))
 #endif				/* not GC_STR_H */
diff --git a/display.c b/display.c
index 0bde4e5..04050dd 100644
--- a/display.c
+++ b/display.c
@@ -1,4 +1,4 @@
-/* $Id: display.c,v 1.50 2003/01/10 16:08:20 ukai Exp $ */
+/* $Id: display.c,v 1.51 2003/01/20 15:30:19 ukai Exp $ */
 #include <signal.h>
 #include "fm.h"
 
@@ -1178,6 +1178,12 @@ message(char *s, int return_x, int return_y)
     move(return_y, return_x);
 }
 
+void disp_err_message(char *s, int redraw_current)
+{
+    record_err_message(s);
+    disp_message(s, redraw_current);
+}
+
 void
 disp_message_nsec(char *s, int redraw_current, int sec, int purge, int mouse)
 {
diff --git a/file.c b/file.c
index a8c16be..bd80c6a 100644
--- a/file.c
+++ b/file.c
@@ -1,4 +1,4 @@
-/* $Id: file.c,v 1.193 2003/01/19 08:28:40 ukai Exp $ */
+/* $Id: file.c,v 1.194 2003/01/20 15:30:20 ukai Exp $ */
 #include "fm.h"
 #include <sys/types.h>
 #include "myctype.h"
@@ -1910,7 +1910,8 @@ loadGeneralFile(char *path, ParsedURL *volatile current, char *referer,
 	tmp = tmpfname(TMPF_SRC, ".html");
 	src = fopen(tmp->ptr, "w");
 	if (src) {
-	    Strfputs(conv_str(page, InnerCode, code), src);
+	    Str s = conv_str(page, InnerCode, code);
+	    Strfputs(s, src);
 	    fclose(src);
 	}
 	if (do_download) {
@@ -6940,7 +6941,8 @@ saveBuffer(Buffer *buf, FILE * f)
 	else
 #endif
 	    tmp = Strnew_charp_n(l->lineBuf, l->len);
-	Strfputs(conv_str(tmp, InnerCode, DisplayCode), f);
+	tmp = conv_str(tmp, InnerCode, DisplayCode);
+	Strfputs(tmp, f);
 	if (Strlastchar(tmp) != '\n')
 	    putc('\n', f);
     }
diff --git a/frame.c b/frame.c
index 043ffd1..11b863b 100644
--- a/frame.c
+++ b/frame.c
@@ -1,4 +1,4 @@
-/* $Id: frame.c,v 1.29 2003/01/15 16:11:43 ukai Exp $ */
+/* $Id: frame.c,v 1.30 2003/01/20 15:30:20 ukai Exp $ */
 #include "fm.h"
 #include "parsetagx.h"
 #include "myctype.h"
@@ -805,9 +805,8 @@ createFrameFile(struct frameset *f, FILE * f1, Buffer *current, int level,
 			    parsedtag_set_value(tag, ATTR_TARGET, d_target);
 			}
 			if (parsedtag_need_reconstruct(tag))
-			    Strfputs(parsedtag2str(tag), f1);
-			else
-			    Strfputs(tok, f1);
+			    tok = parsedtag2str(tag);
+			Strfputs(tok, f1);
 		    }
 		    else {
 			if (pre_mode & (RB_PLAIN | RB_INTXTA))
diff --git a/proto.h b/proto.h
index 38aa685..db1256e 100644
--- a/proto.h
+++ b/proto.h
@@ -1,4 +1,4 @@
-/* $Id: proto.h,v 1.80 2003/01/17 16:57:20 ukai Exp $ */
+/* $Id: proto.h,v 1.81 2003/01/20 15:30:20 ukai Exp $ */
 /* 
  *   This file was automatically generated by version 1.7 of cextract.
  *   Manual editing not recommended.
@@ -276,7 +276,7 @@ extern void addChar(char c, Lineprop mode);
 extern void record_err_message(char *s);
 extern Buffer *message_list_panel(void);
 extern void message(char *s, int return_x, int return_y);
-#define disp_err_message(s, f) (record_err_message((s)), disp_message((s), (f)))
+extern void disp_err_message(char *s, int redraw_current);
 extern void disp_message_nsec(char *s, int redraw_current, int sec, int purge,
 			      int mouse);
 extern void disp_message(char *s, int redraw_current);
diff --git a/table.c b/table.c
index 8795bec..606452d 100644
--- a/table.c
+++ b/table.c
@@ -1,4 +1,4 @@
-/* $Id: table.c,v 1.37 2002/12/17 16:17:30 ukai Exp $ */
+/* $Id: table.c,v 1.38 2003/01/20 15:30:21 ukai Exp $ */
 /* 
  * HTML table
  */
@@ -449,7 +449,7 @@ pushdata(struct table *t, int row, int col, char *data)
     if (t->tabdata[row][col] == NULL)
 	t->tabdata[row][col] = newGeneralList();
 
-    pushText(t->tabdata[row][col], data);
+    pushText(t->tabdata[row][col], data ? data : "");
 }
 
 void
@@ -460,7 +460,7 @@ suspend_or_pushdata(struct table *tbl, char *line)
     else {
 	if (!tbl->suspended_data)
 	    tbl->suspended_data = newTextList();
-	pushText(tbl->suspended_data, line);
+	pushText(tbl->suspended_data, line ? line : "");
     }
 }
 
diff --git a/textlist.h b/textlist.h
index e66426b..f28b199 100644
--- a/textlist.h
+++ b/textlist.h
@@ -1,4 +1,4 @@
-/* $Id: textlist.h,v 1.5 2002/09/24 16:35:02 ukai Exp $ */
+/* $Id: textlist.h,v 1.6 2003/01/20 15:30:22 ukai Exp $ */
 #ifndef TEXTLIST_H
 #define TEXTLIST_H
 #include "Str.h"
@@ -40,7 +40,7 @@ typedef struct _textlist {
 } TextList;
 
 #define newTextList() ((TextList *)newGeneralList())
-#define pushText(tl, s) pushValue((GeneralList *)(tl), (void *)allocStr((s)?(s):"",-1))
+#define pushText(tl, s) pushValue((GeneralList *)(tl), (void *)allocStr((s),-1))
 #define popText(tl) ((char *)popValue((GeneralList *)(tl)))
 #define rpopText(tl) ((char *)rpopValue((GeneralList *)(tl)))
 #define delText(tl, i) delValue((GeneralList *)(tl), (void *)(i))