diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-09 06:11:10 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-09 06:11:10 +0000 |
commit | 11fd9224f784a2e1904cd9cc573c926d072c56e1 (patch) | |
tree | 608f20a0865383dd404958bda2d2378f3412ce54 /dir.c | |
parent | a5488474c29af2cf97377f7a93d820c2beb9a3e2 (diff) |
* dir.c (sys_warning): get rid of type-punning function cast.
* dir.c (ruby_glob0): get rid of possible overflow.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23656 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'dir.c')
-rw-r--r-- | dir.c | 13 |
1 files changed, 7 insertions, 6 deletions
@@ -910,15 +910,16 @@ dir_s_rmdir(VALUE obj, VALUE dir) return INT2FIX(0); } -static void -sys_warning_1(const char* mesg) +static VALUE +sys_warning_1(VALUE mesg) { - rb_sys_warning("%s", mesg); + rb_sys_warning("%s", (const char *)mesg); + return Qnil; } -#define GLOB_VERBOSE (1UL << (sizeof(int) * CHAR_BIT - 1)) +#define GLOB_VERBOSE (1U << (sizeof(int) * CHAR_BIT - 1)) #define sys_warning(val) \ - (void)((flags & GLOB_VERBOSE) && rb_protect((VALUE (*)(VALUE))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_N(type, n) (type *)malloc(sizeof(type) * (n)) @@ -1383,7 +1384,7 @@ ruby_glob0(const char *path, int flags, ruby_glob_func *func, VALUE arg, rb_enco struct glob_pattern *list; const char *root, *start; char *buf; - int n; + size_t n; int status; start = root = path; |