1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* dir.c: parenthesize macro arguments.

Browse Source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30143 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2010-12-08 11:38:29 +00:00
parent af3d6b53dc
commit fad7d95a18
2 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
Wed Dec 8 20:37:11 2010 Tanaka Akira <akr@fsij.org>
* dir.c: parenthesize macro arguments.
Tue Dec 7 22:37:15 2010 Masaya Tarui <tarui@ruby-lnag.org> Tue Dec 7 22:37:15 2010 Masaya Tarui <tarui@ruby-lnag.org>
* io.c (io_read): duplicate string if shared. [ruby-dev:42719] * io.c (io_read): duplicate string if shared. [ruby-dev:42719]
@ -80,7 +84,7 @@ Tue Dec 7 08:00:44 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
* win32/Makefile.sub (WARNFLAGS): make declaration conflict * win32/Makefile.sub (WARNFLAGS): make declaration conflict
warnings errors if possible. warnings errors if possible.
Sun Dec 5 10:32:11 2010 Tanaka Akira <akr@fsij.org> Sun Dec 7 21:16:10 2010 Tanaka Akira <akr@fsij.org>
* cont.c: parenthesize macro arguments. * cont.c: parenthesize macro arguments.

30
dir.c
View File

@ -72,7 +72,7 @@ char *strchr(char*,char);
#undef chdir #undef chdir
#define chdir(p) rb_w32_uchdir(p) #define chdir(p) rb_w32_uchdir(p)
#undef mkdir #undef mkdir
#define mkdir(p, m) rb_w32_umkdir(p, m) #define mkdir(p, m) rb_w32_umkdir((p), (m))
#undef rmdir #undef rmdir
#define rmdir(p) rb_w32_urmdir(p) #define rmdir(p) rb_w32_urmdir(p)
#endif #endif
@ -90,8 +90,8 @@ char *strchr(char*,char);
#define FNM_NOMATCH 1 #define FNM_NOMATCH 1
#define FNM_ERROR 2 #define FNM_ERROR 2
# define Next(p, e, enc) (p + rb_enc_mbclen(p, e, enc)) # define Next(p, e, enc) ((p)+ rb_enc_mbclen((p), (e), (enc)))
# define Inc(p, e, enc) ((p) = Next(p, e, enc)) # define Inc(p, e, enc) ((p) = Next((p), (e), (enc)))
static char * static char *
bracket( bracket(
@ -353,9 +353,9 @@ static VALUE dir_close(VALUE);
#define GlobPathValue(str, safe) \ #define GlobPathValue(str, safe) \
/* can contain null bytes as separators */ \ /* can contain null bytes as separators */ \
(!RB_TYPE_P(str, T_STRING) ? \ (!RB_TYPE_P((str), T_STRING) ? \
(void)FilePathValue(str) : \ (void)FilePathValue(str) : \
(void)(check_safe_glob(str, safe), \ (void)(check_safe_glob((str), (safe)), \
check_glob_encoding(str), (str))) check_glob_encoding(str), (str)))
#define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0) #define check_safe_glob(str, safe) ((safe) ? rb_check_safe_obj(str) : (void)0)
#define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding())) #define check_glob_encoding(str) rb_enc_check((str), rb_enc_from_encoding(rb_usascii_encoding()))
@ -466,7 +466,7 @@ dir_check(VALUE dir)
return dirp; return dirp;
} }
#define GetDIR(obj, dirp) (dirp = dir_check(obj)) #define GetDIR(obj, dirp) ((dirp) = dir_check(obj))
/* /*
@ -508,11 +508,11 @@ dir_path(VALUE dir)
} }
#if defined HAVE_READDIR_R #if defined HAVE_READDIR_R
# define READDIR(dir, enc, entry, dp) (readdir_r(dir, entry, &(dp)) == 0 && dp != 0) # define READDIR(dir, enc, entry, dp) (readdir_r((dir), (entry), &(dp)) == 0 && (dp) != 0)
#elif defined _WIN32 #elif defined _WIN32
# define READDIR(dir, enc, entry, dp) ((dp = rb_w32_readdir_with_enc(dir, enc)) != 0) # define READDIR(dir, enc, entry, dp) (((dp) = rb_w32_readdir_with_enc((dir), (enc))) != 0)
#else #else
# define READDIR(dir, enc, entry, dp) ((dp = readdir(dir)) != 0) # define READDIR(dir, enc, entry, dp) (((dp) = readdir(dir)) != 0)
#endif #endif
#if defined HAVE_READDIR_R #if defined HAVE_READDIR_R
# define IF_HAVE_READDIR_R(something) something # define IF_HAVE_READDIR_R(something) something
@ -997,10 +997,10 @@ sys_warning_1(VALUE mesg)
#define sys_warning(val) \ #define sys_warning(val) \
(void)((flags & GLOB_VERBOSE) && rb_protect(sys_warning_1, (VALUE)(val), 0)) (void)((flags & GLOB_VERBOSE) && rb_protect(sys_warning_1, (VALUE)(val), 0))
#define GLOB_ALLOC(type) (type *)malloc(sizeof(type)) #define GLOB_ALLOC(type) ((type *)malloc(sizeof(type)))
#define GLOB_ALLOC_N(type, n) (type *)malloc(sizeof(type) * (n)) #define GLOB_ALLOC_N(type, n) ((type *)malloc(sizeof(type) * (n)))
#define GLOB_FREE(ptr) free(ptr) #define GLOB_FREE(ptr) free(ptr)
#define GLOB_JUMP_TAG(status) ((status == -1) ? rb_memerror() : rb_jump_tag(status)) #define GLOB_JUMP_TAG(status) (((status) == -1) ? rb_memerror() : rb_jump_tag(status))
/* /*
* ENOTDIR can be returned by stat(2) if a non-leaf element of the path * ENOTDIR can be returned by stat(2) if a non-leaf element of the path
@ -1240,14 +1240,14 @@ join_path(const char *path, int dirsep, const char *name)
enum answer { YES, NO, UNKNOWN }; enum answer { YES, NO, UNKNOWN };
#ifndef S_ISDIR #ifndef S_ISDIR
# define S_ISDIR(m) ((m & S_IFMT) == S_IFDIR) # define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#endif #endif
#ifndef S_ISLNK #ifndef S_ISLNK
# ifndef S_IFLNK # ifndef S_IFLNK
# define S_ISLNK(m) (0) # define S_ISLNK(m) (0)
# else # else
# define S_ISLNK(m) ((m & S_IFMT) == S_IFLNK) # define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
# endif # endif
#endif #endif
@ -1267,7 +1267,7 @@ glob_func_caller(VALUE val)
return Qnil; return Qnil;
} }
#define glob_call_func(func, path, arg, enc) (*func)(path, arg, enc) #define glob_call_func(func, path, arg, enc) (*(func))((path), (arg), (enc))
static int static int
glob_helper( glob_helper(