aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-15 06:34:21 +0000
committerocean <ocean@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2004-02-15 06:34:21 +0000
commit30fd29a174bb8ad17f4947af977992ff435643f1 (patch)
tree4011b7f33c3e978dc26381104bc5181c4f0d6db7
parenta4eb11ac447fb023111f80a15b8a384e7288dffe (diff)
downloadruby-30fd29a174bb8ad17f4947af977992ff435643f1.tar.gz
* ruby.h, dir.c (rb_glob): add const.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5709 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--dir.c18
-rw-r--r--ruby.h2
3 files changed, 14 insertions, 10 deletions
diff --git a/ChangeLog b/ChangeLog
index 7e53d1490d..80c0cc0b96 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Feb 15 15:23:29 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp>
+
+ * ruby.h, dir.c (rb_glob): add const.
+
Sun Feb 15 01:46:05 2004 GOTOU Yuuzou <gotoyuzo@notwork.org>
* lib/mkmf.rb: absolute path of ruby is assigned to $(RUBY).
diff --git a/dir.c b/dir.c
index 5e8ecfa449..580d2617e0 100644
--- a/dir.c
+++ b/dir.c
@@ -914,10 +914,10 @@ do_opendir(path)
/* Return nonzero if S has any special globbing chars in it. */
static int
has_magic(s, flags)
- char *s;
+ const char *s;
int flags;
{
- register char *p = s;
+ register const char *p = s;
register char c;
int open = 0;
int escape = !(flags & FNM_NOESCAPE);
@@ -1311,7 +1311,7 @@ rb_glob2(path, flags, func, arg)
void
rb_glob(path, func, arg)
- char *path;
+ const char *path;
void (*func) _((const char*, VALUE));
VALUE arg;
{
@@ -1336,7 +1336,7 @@ push_pattern(path, ary)
static void
push_globs(ary, s, flags)
VALUE ary;
- char *s;
+ const char *s;
int flags;
{
rb_glob2(s, flags, push_pattern, ary);
@@ -1345,12 +1345,12 @@ push_globs(ary, s, flags)
static void
push_braces(ary, s, flags)
VALUE ary;
- char *s;
+ const char *s;
int flags;
{
char *buf;
- char *p, *t, *b;
- char *lbrace, *rbrace;
+ const char *p, *t, *b;
+ const char *lbrace, *rbrace;
int nest = 0;
p = s;
@@ -1400,9 +1400,9 @@ rb_push_glob(str, flags)
VALUE str;
int flags;
{
- char *p, *pend;
+ const char *p, *pend;
char *buf;
- char *t;
+ const char *t;
int nest, maxnest;
int escape = !(flags & FNM_NOESCAPE);
VALUE ary;
diff --git a/ruby.h b/ruby.h
index ef8ef20730..dc91588d82 100644
--- a/ruby.h
+++ b/ruby.h
@@ -468,7 +468,7 @@ struct RBignum {
void rb_obj_infect _((VALUE,VALUE));
-void rb_glob _((char*,void(*)(const char*,VALUE),VALUE));
+void rb_glob _((const char*,void(*)(const char*,VALUE),VALUE));
VALUE rb_define_class _((const char*,VALUE));
VALUE rb_define_module _((const char*));