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

zonetab.h: use strncmp

Browse source 
* ext/date/zonetab.h (zonetab): use strncmp.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2016-10-01 08:52:43 +00:00
parent c943e59603
commit d618f7b79a
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ext/date/date_parse.c
View file

@ -386,16 +386,13 @@ date_zone_to_diff(VALUE str)
if (l >= (int)sizeof(STD) - 1 && strcmp(d - (sizeof(STD) - 1), STD) == 0) { if (l >= (int)sizeof(STD) - 1 && strcmp(d - (sizeof(STD) - 1), STD) == 0) {
l -= sizeof(STD) - 1; l -= sizeof(STD) - 1;
s[l] = '\0';
} }
else if (l >= (int)sizeof(DST1) - 1 && strcmp(d - (sizeof(DST1) - 1), DST1) == 0) { else if (l >= (int)sizeof(DST1) - 1 && strcmp(d - (sizeof(DST1) - 1), DST1) == 0) {
l -= sizeof(DST1) - 1; l -= sizeof(DST1) - 1;
s[l] = '\0';
dst = 1; dst = 1;
} }
else if (l >= (int)sizeof(DST2) - 1 && strcmp(d - (sizeof(DST2) - 1), DST2) == 0) { else if (l >= (int)sizeof(DST2) - 1 && strcmp(d - (sizeof(DST2) - 1), DST2) == 0) {
l -= sizeof(DST2) - 1; l -= sizeof(DST2) - 1;
s[l] = '\0';
dst = 1; dst = 1;
} }
{ {

2
ext/date/prereq.mk
View file

@ -1,7 +1,7 @@
.SUFFIXES: .list .SUFFIXES: .list
.list.h: .list.h:
gperf -E -C -P -p -j1 -i 1 -g -o -t -N $(*F) $< \ gperf -E -C -c -P -p -j1 -i 1 -g -o -t -N $(*F) $< \
| sed 's/(int)(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \ | sed 's/(int)(long)&((\(struct stringpool_t\) *\*)0)->\(stringpool_[a-z0-9]*\)/offsetof(\1, \2)/g' \
> $(@F) > $(@F)

4
ext/date/zonetab.h
View file

@ -1,5 +1,5 @@
/* C code produced by gperf version 3.0.4 */ /* C code produced by gperf version 3.0.4 */
/* Command-line: gperf -E -C -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list */ /* Command-line: gperf -E -C -c -P -p -j1 -i 1 -g -o -t -N zonetab zonetab.list */
/* Computed positions: -k'1-4,$' */ /* Computed positions: -k'1-4,$' */
#if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \ #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@ -891,7 +891,7 @@ zonetab (str, len)
{ {
register const char *s = o + stringpool; register const char *s = o + stringpool;
if (*str == *s && !strcmp (str + 1, s + 1)) if (*str == *s && !strncmp (str + 1, s + 1, len - 1) && s[len] == '\0')
return &wordlist[key]; return &wordlist[key];
} }
} }