From 18eebc64880fabfebf4e118e5b9974d221dd20cd Mon Sep 17 00:00:00 2001 From: Fumitoshi UKAI Date: Mon, 20 Jan 2003 15:30:18 +0000 Subject: [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 --- Str.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Str.h') 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 */ -- cgit v1.2.3