diff options
author | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 10:39:57 +0000 |
---|---|---|
committer | knu <knu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-06 10:39:57 +0000 |
commit | 2b785b0f3e4f902e7de29a895d1f6ae0f10c3265 (patch) | |
tree | bc1801ecbd4d1e852a5ae0a0b8202a41c7ec933b /regex.c | |
parent | 23a434b3630b05781dc48e07582ed180d9661a6a (diff) |
Merge changes from ruby_1_8 to reduce warnings and potentially improve
security.
* mkconfig.rb: hide build path from rbconfig.rb.
* util.c (ruby_strtod, dtoa): initialize more variables for error
handling.
* io.c (rscheck), marshal.c (w_nbyte, w_bytes, w_unique),
(path2class, path2module): constified.
* pack.c (pack_unpack), process.c (rb_syswait): suppress warnings.
* suppress warnings on cygwin, mingw and mswin.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16863 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'regex.c')
-rw-r--r-- | regex.c | 10 |
1 files changed, 8 insertions, 2 deletions
@@ -164,7 +164,7 @@ static void store_jump _((char*, int, char*)); static void insert_jump _((int, char*, char*, char*)); static void store_jump_n _((char*, int, char*, unsigned)); static void insert_jump_n _((int, char*, char*, char*, unsigned)); -static void insert_op _((int, char*, char*)); +/*static void insert_op _((int, char*, char*));*/ static void insert_op_2 _((int, char*, char*, int, int)); static int memcmp_translate _((unsigned char*, unsigned char*, int)); @@ -508,6 +508,7 @@ utf8_firstbyte(c) #endif } +#if 0 static void print_mbc(c) unsigned int c; @@ -538,6 +539,7 @@ print_mbc(c) printf("%c%c", (int)(c >> BYTEWIDTH), (int)(c &0xff)); } } +#endif /* If the buffer isn't allocated when it comes in, use this. */ #define INIT_BUF_SIZE 28 @@ -752,6 +754,7 @@ is_in_list(c, b) return is_in_list_sbc(c, b) || (current_mbctype ? is_in_list_mbc(c, b) : 0); } +#if 0 static void print_partial_compiled_pattern(start, end) unsigned char *start; @@ -1006,6 +1009,7 @@ print_compiled_pattern(bufp) print_partial_compiled_pattern(buffer, buffer + bufp->used); } +#endif static char* calculate_must_string(start, end) @@ -1208,7 +1212,7 @@ read_special(p, pend, pp) the `struct re_pattern_buffer' that bufp pointed to, after re_compile_pattern returns. */ -char * +const char * re_compile_pattern(pattern, size, bufp) const char *pattern; int size; @@ -2580,6 +2584,7 @@ insert_jump_n(op, from, to, current_end, n) } +#if 0 /* Open up space at location THERE, and insert operation OP. CURRENT_END gives the end of the storage in use, so we know how much data to copy up. @@ -2599,6 +2604,7 @@ insert_op(op, there, current_end) there[0] = (char)op; } +#endif /* Open up space at location THERE, and insert operation OP followed by |