diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | win32/win32.c | 22 | ||||
| -rw-r--r-- | win32/win32.h | 13 |
3 files changed, 25 insertions, 19 deletions
@@ -1,3 +1,12 @@ +Wed Sep 7 09:21:41 2005 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> + + * win32/win32.[hc] (rb_w32_utime): constified. + + * win32/win32.h (rb_w32_stat): added prototype. + + * win32/win32.[hc] (rb_w32_argv_size,rb_w32_join_argv,rb_w32_aspawn): + changed `char *const *' to `const char *const *'. (constify string) + Wed Sep 7 08:35:04 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> * Makefile.in, configure.in (MINIOBJS): miniruby on HP-UX can not load diff --git a/win32/win32.c b/win32/win32.c index 3b337bafd0..784d585e14 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -352,7 +352,8 @@ flock(int fd, int oper) (DWORD)-1); } -static void init_env(void) +static void +init_env(void) { char env[_MAX_PATH]; DWORD len; @@ -617,10 +618,9 @@ rb_w32_get_osfhandle(int fh) } int -rb_w32_argv_size(char *const *argv) +rb_w32_argv_size(const char *const *argv) { - const char *p; - char *const *t; + const char *p, *const *t; int len, n, bs, quote; for (t = argv, len = 0; *t; t++) { @@ -648,10 +648,10 @@ rb_w32_argv_size(char *const *argv) } char * -rb_w32_join_argv(char *cmd, char *const *argv) +rb_w32_join_argv(char *cmd, const char *const *argv) { - const char *p, *s; - char *q, *const *t; + const char *p, *s, *const *t; + char *q; int n, bs, quote; for (t = argv, q = cmd; p = *t; t++) { @@ -846,7 +846,7 @@ rb_w32_spawn(int mode, const char *cmd, const char *prog) } int -rb_w32_aspawn(int mode, const char *prog, char *const *argv) +rb_w32_aspawn(int mode, const char *prog, const char *const *argv) { int len = rb_w32_argv_size(argv); char *cmd = ALLOCA_N(char, len); @@ -3555,12 +3555,8 @@ unixtime_to_filetime(time_t time, FILETIME *ft) return 0; } -#undef utime -#ifdef __BORLANDC__ -#define utime _utime -#endif int -rb_w32_utime(const char *path, struct utimbuf *times) +rb_w32_utime(const char *path, const struct utimbuf *times) { HANDLE hFile; SYSTEMTIME st; diff --git a/win32/win32.h b/win32/win32.h index a347f04f7a..e6bb50ca8a 100644 --- a/win32/win32.h +++ b/win32/win32.h @@ -187,10 +187,10 @@ extern int chown(const char *, int, int); extern int link(const char *, const char *); extern int gettimeofday(struct timeval *, struct timezone *); extern rb_pid_t waitpid (rb_pid_t, int *, int); -extern int rb_w32_argv_size(char *const *); -extern char *rb_w32_join_argv(char *, char *const *); -extern int rb_w32_spawn(int, const char *, const char*); -extern int rb_w32_aspawn(int, const char *, char *const *); +extern int rb_w32_argv_size(const char *const *); +extern char *rb_w32_join_argv(char *, const char *const *); +extern int rb_w32_spawn(int, const char *, const char *); +extern int rb_w32_aspawn(int, const char *, const char *const *); extern int kill(int, int); extern int fcntl(int, int, ...); extern rb_pid_t rb_w32_getpid(void); @@ -199,7 +199,8 @@ extern int rb_w32_isatty(int); #endif extern int rb_w32_mkdir(const char *, int); extern int rb_w32_rmdir(const char *); -extern int rb_w32_unlink(const char*); +extern int rb_w32_unlink(const char *); +extern int rb_w32_stat(const char *, struct stat *); #ifdef __BORLANDC__ extern int rb_w32_fstat(int, struct stat *); @@ -519,7 +520,7 @@ int rb_w32_putc(int, FILE*); int rb_w32_getc(FILE*); int rb_w32_close(int); int rb_w32_fclose(FILE*); -int rb_w32_utime(const char *, struct utimbuf *); +int rb_w32_utime(const char *, const struct utimbuf *); #define Sleep(msec) (void)rb_w32_sleep(msec) /* |