summaryrefslogtreecommitdiff
path: root/strftime.c
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-08 03:11:36 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-08 03:11:36 +0000
commit042718c2adf52b73805a4d7c729188c48fc60274 (patch)
treeebcb143303ca16ea376ed9dbe491a5c782fc29ea /strftime.c
parentdde4a171dbc2b19bb8552acec555b3116152c5dc (diff)
revert r64955
r64954 didn't work... In this commit, I'm experimenting https://git.ruby-lang.org/ruby-commit-hook.git/commit/svn-utils/bin/auto-style.rb?id=2a1a17da1c163e8fc4321759d95057441ddf2c0a We can distinguish possible 2 issues by this commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64956 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'strftime.c')
-rw-r--r--strftime.c28
1 files changed, 14 insertions, 14 deletions
diff --git a/strftime.c b/strftime.c
index edb5461f24..c864076f10 100644
--- a/strftime.c
+++ b/strftime.c
@@ -226,8 +226,8 @@ format_value(VALUE val, int base)
*/
static VALUE
rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len,
- rb_encoding *enc, VALUE time, const struct vtm *vtm,
- VALUE timev, struct timespec *ts, int gmt, size_t maxsize)
+ rb_encoding *enc, VALUE time, const struct vtm *vtm,
+ VALUE timev, struct timespec *ts, int gmt, size_t maxsize)
{
size_t len = RSTRING_LEN(ftime);
char *s = RSTRING_PTR(ftime);
@@ -246,7 +246,7 @@ rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len,
#ifdef MAILHEADER_EXT
int sign;
#endif
- VALUE zone = Qnil;
+ VALUE zone = Qnil;
/* various tables, useful in North America */
static const char days_l[][10] = {
@@ -318,7 +318,7 @@ rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len,
len = s - start; \
rb_str_set_len(ftime, len); \
if (!rb_strftime_with_timespec(ftime, (fmt), rb_strlen_lit(fmt), \
- enc, time, vtm, timev, ts, gmt, maxsize)) \
+ enc, time, vtm, timev, ts, gmt, maxsize)) \
return 0; \
s = RSTRING_PTR(ftime); \
i = RSTRING_LEN(ftime) - len; \
@@ -624,10 +624,10 @@ rb_strftime_with_timespec(VALUE ftime, const char *format, size_t format_len,
i = 0;
}
else {
- if (NIL_P(zone)) {
- zone = rb_time_zone_abbreviation(vtm->zone, time);
- }
- tp = RSTRING_PTR(zone);
+ if (NIL_P(zone)) {
+ zone = rb_time_zone_abbreviation(vtm->zone, time);
+ }
+ tp = RSTRING_PTR(zone);
if (enc) {
for (i = 0; i < TBUFSIZE && tp[i]; i++) {
if ((unsigned char)tp[i] > 0x7F) {
@@ -917,33 +917,33 @@ strftime_size_limit(size_t format_len)
VALUE
rb_strftime(const char *format, size_t format_len, rb_encoding *enc,
- VALUE time, const struct vtm *vtm, VALUE timev, int gmt)
+ VALUE time, const struct vtm *vtm, VALUE timev, int gmt)
{
VALUE result = rb_enc_str_new(0, 0, enc);
return rb_strftime_with_timespec(result, format, format_len, enc,
- time, vtm, timev, NULL, gmt,
+ time, vtm, timev, NULL, gmt,
strftime_size_limit(format_len));
}
VALUE
rb_strftime_timespec(const char *format, size_t format_len, rb_encoding *enc,
- VALUE time, const struct vtm *vtm, struct timespec *ts, int gmt)
+ VALUE time, const struct vtm *vtm, struct timespec *ts, int gmt)
{
VALUE result = rb_enc_str_new(0, 0, enc);
return rb_strftime_with_timespec(result, format, format_len, enc,
- time, vtm, Qnil, ts, gmt,
+ time, vtm, Qnil, ts, gmt,
strftime_size_limit(format_len));
}
#if 0
VALUE
rb_strftime_limit(const char *format, size_t format_len, rb_encoding *enc,
- VALUE time, const struct vtm *vtm, struct timespec *ts,
+ VALUE time, const struct vtm *vtm, struct timespec *ts,
int gmt, size_t maxsize)
{
VALUE result = rb_enc_str_new(0, 0, enc);
return rb_strftime_with_timespec(result, format, format_len, enc,
- time, vtm, Qnil, ts, gmt, maxsize);
+ time, vtm, Qnil, ts, gmt, maxsize);
}
#endif