diff options
| author | Yukihiro Matsumoto <[email protected]> | 2012-06-27 15:22:08 +0900 |
|---|---|---|
| committer | Yukihiro Matsumoto <[email protected]> | 2012-06-27 15:22:08 +0900 |
| commit | 3de0a625225968faa301feabaddef96b38025e2c (patch) | |
| tree | 7fcc62b683f6bfdb0011d6ab45513ade5e6285ed /src/time.c | |
| parent | 0a88499f32f38b5608d50da59fc7d22132767c0d (diff) | |
| parent | 50f38a7df33e8814cb7333310cfecceb6adde14d (diff) | |
| download | mruby-3de0a625225968faa301feabaddef96b38025e2c.tar.gz mruby-3de0a625225968faa301feabaddef96b38025e2c.zip | |
resolve conflict in class.c
Diffstat (limited to 'src/time.c')
| -rw-r--r-- | src/time.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/time.c b/src/time.c index 28cc3c1a3..3da824e82 100644 --- a/src/time.c +++ b/src/time.c @@ -435,7 +435,7 @@ mrb_time_asctime(mrb_state *mrb, mrb_value self) tm = mrb_get_datatype(mrb, self, &mrb_time_type); if (!tm) return mrb_nil_value(); d = &tm->datetime; - len = snprintf(buf, 256, "%s %s %02d %02d:%02d:%02d %s%d", + len = snprintf(buf, sizeof(buf), "%s %s %02d %02d:%02d:%02d %s%d", wday_names[d->tm_wday], mon_names[d->tm_mon], d->tm_mday, d->tm_hour, d->tm_min, d->tm_sec, tm->timezone == MRB_TIMEZONE_UTC ? "UTC " : "", |