From a773539d3af48a8e95960fa1c98d0be790a6e529 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 12 Dec 2012 09:27:12 +0000 Subject: time.c: st_update * time.c (zone_str): lookup or insert by using st_update() at once. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38343 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- time.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'time.c') diff --git a/time.c b/time.c index c8aedd8..29565be 100644 --- a/time.c +++ b/time.c @@ -1023,22 +1023,28 @@ timegmw_noleapsecond(struct vtm *vtm) static st_table *zone_table; +static int +zone_str_update(st_data_t *key, st_data_t *value, st_data_t arg, int existing) +{ + const char *s = (const char *)*key; + const char **ret = (const char **)arg; + + if (existing) { + *ret = (const char *)*value; + return ST_STOP; + } + *ret = s = strdup(s); + *key = *value = (st_data_t)s; + return ST_CONTINUE; +} + static const char * zone_str(const char *s) { - st_data_t k, v; - if (!zone_table) zone_table = st_init_strtable(); - k = (st_data_t)s; - if (st_lookup(zone_table, k, &v)) { - return (const char *)v; - } - s = strdup(s); - k = (st_data_t)s; - st_add_direct(zone_table, k, k); - + st_update(zone_table, (st_data_t)s, zone_str_update, (st_data_t)&s); return s; } -- cgit v1.1