kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* strftime.c: parenthesize macro arguments.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30446 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
akr 2011-01-01 02:45:04 +00:00
parent 778796b008
commit ccc55bb7c3
2 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Sat Jan 1 11:44:42 2011 Tanaka Akira <akr@fsij.org>
* strftime.c: parenthesize macro arguments.
Sat Jan 1 11:10:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org> Sat Jan 1 11:10:29 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/zlib/zlib.c: take care of platforms where long is bigger * ext/zlib/zlib.c: take care of platforms where long is bigger

18
strftime.c
View file

@ -120,7 +120,7 @@ extern char *getenv();
extern char *strchr(); extern char *strchr();
#endif #endif
#define range(low, item, hi) max(low, min(item, hi)) #define range(low, item, hi) max((low), min((item), (hi)))
#undef min /* just in case */ #undef min /* just in case */
@ -212,10 +212,10 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, const str
} while (0) } while (0)
#define NEEDS(n) do if (s + (n) >= endp - 1) goto err; while (0) #define NEEDS(n) do if (s + (n) >= endp - 1) goto err; while (0)
#define FILL_PADDING(i) do { \ #define FILL_PADDING(i) do { \
if (!(flags & BIT_OF(LEFT)) && precision > i) { \ if (!(flags & BIT_OF(LEFT)) && precision > (i)) { \
NEEDS(precision); \ NEEDS(precision); \
memset(s, padding ? padding : ' ', precision - i); \ memset(s, padding ? padding : ' ', precision - (i)); \
s += precision - i; \ s += precision - (i); \
} \ } \
else { \ else { \
NEEDS(i); \ NEEDS(i); \
@ -227,14 +227,14 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, const str
if (precision <= 0) precision = (def_prec); \ if (precision <= 0) precision = (def_prec); \
if (flags & BIT_OF(LEFT)) precision = 1; \ if (flags & BIT_OF(LEFT)) precision = 1; \
l = snprintf(s, endp - s, \ l = snprintf(s, endp - s, \
((padding == '0' || (!padding && def_pad == '0')) ? "%0*"fmt : "%*"fmt), \ ((padding == '0' || (!padding && (def_pad) == '0')) ? "%0*"fmt : "%*"fmt), \
precision, val); \ precision, (val)); \
if (l < 0) goto err; \ if (l < 0) goto err; \
s += l; \ s += l; \
} while (0) } while (0)
#define STRFTIME(fmt) \ #define STRFTIME(fmt) \
do { \ do { \
i = rb_strftime_with_timespec(s, endp - s, fmt, vtm, timev, ts, gmt); \ i = rb_strftime_with_timespec(s, endp - s, (fmt), vtm, timev, ts, gmt); \
if (!i) return 0; \ if (!i) return 0; \
if (precision > i) {\ if (precision > i) {\
memmove(s + precision - i, s, i);\ memmove(s + precision - i, s, i);\
@ -255,8 +255,8 @@ rb_strftime_with_timespec(char *s, size_t maxsize, const char *format, const str
if (precision <= 0) precision = (def_prec); \ if (precision <= 0) precision = (def_prec); \
if (flags & BIT_OF(LEFT)) precision = 1; \ if (flags & BIT_OF(LEFT)) precision = 1; \
args[0] = INT2FIX(precision); \ args[0] = INT2FIX(precision); \
args[1] = val; \ args[1] = (val); \
if (padding == '0' || (!padding && def_pad == '0')) \ if (padding == '0' || (!padding && (def_pad) == '0')) \
result = rb_str_format(2, args, rb_str_new2("%0*"fmt)); \ result = rb_str_format(2, args, rb_str_new2("%0*"fmt)); \
else \ else \
result = rb_str_format(2, args, rb_str_new2("%*"fmt)); \ result = rb_str_format(2, args, rb_str_new2("%*"fmt)); \