diff options
author | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-20 15:30:18 +0000 |
---|---|---|
committer | Fumitoshi UKAI <ukai@debian.or.jp> | 2003-01-20 15:30:18 +0000 |
commit | 18eebc64880fabfebf4e118e5b9974d221dd20cd (patch) | |
tree | f51b02643683377438d82c27b20110a79a58265a /file.c | |
parent | [w3m-dev 03659] Can't download from SSL. (diff) | |
download | w3m-18eebc64880fabfebf4e118e5b9974d221dd20cd.tar.gz w3m-18eebc64880fabfebf4e118e5b9974d221dd20cd.zip |
[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>
Diffstat (limited to '')
-rw-r--r-- | file.c | 8 |
1 files changed, 5 insertions, 3 deletions
@@ -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); } |