From: Sander Striker Date: Thu, 21 Mar 2002 10:10:41 +0000 (+0000) Subject: Update callers of apr_explode_gmt to apr_time_exp_gmt. The X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=915766daeb24d0b0bff556f85ce100ae361ac152;p=apache Update callers of apr_explode_gmt to apr_time_exp_gmt. The function was renamed in apr. Submitted by: Thom May git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94081 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/include/util_time.h b/include/util_time.h index 1852f89fe5..b69aadc759 100644 --- a/include/util_time.h +++ b/include/util_time.h @@ -92,7 +92,7 @@ AP_DECLARE(apr_status_t) ap_explode_recent_localtime(apr_time_exp_t *tm, * @param tm the exploded time * @param t the time to explode: MUST be within the last * AP_TIME_RECENT_THRESHOLD seconds - * @note This is a faster alternative to apr_explode_gmt that uses + * @note This is a faster alternative to apr_time_exp_gmt that uses * a cache of pre-exploded time structures. It is useful for things * that need to explode the current time multiple times per second, * like loggers. diff --git a/modules/dav/fs/repos.c b/modules/dav/fs/repos.c index 4588911787..5846cdfbc7 100644 --- a/modules/dav/fs/repos.c +++ b/modules/dav/fs/repos.c @@ -306,7 +306,7 @@ static void dav_format_time(int style, apr_time_t sec, char *buf) apr_time_exp_t tms; /* ### what to do if fails? */ - (void) apr_explode_gmt(&tms, sec); + (void) apr_time_exp_gmt(&tms, sec); if (style == DAV_STYLE_ISO8601) { /* ### should we use "-00:00" instead of "Z" ?? */ diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c index 2d83ff30be..39e58a697b 100644 --- a/modules/metadata/mod_usertrack.c +++ b/modules/metadata/mod_usertrack.c @@ -156,8 +156,8 @@ static void make_cookie(request_rec *r) if ((dcfg->style == CT_UNSET) || (dcfg->style == CT_NETSCAPE)) { apr_time_exp_t tms; - apr_explode_gmt(&tms, r->request_time - + cls->expires * APR_USEC_PER_SEC); + apr_time_exp_gmt(&tms, r->request_time + + cls->expires * APR_USEC_PER_SEC); new_cookie = apr_psprintf(r->pool, "%s; expires=%s, " "%.2d-%s-%.2d %.2d:%.2d:%.2d GMT", diff --git a/server/util.c b/server/util.c index 3885786520..e66f291da5 100644 --- a/server/util.c +++ b/server/util.c @@ -148,7 +148,7 @@ AP_DECLARE(char *) ap_ht_time(apr_pool_t *p, apr_time_t t, const char *fmt, int const char *f; char *strp; - apr_explode_gmt(&xt, t); + apr_time_exp_gmt(&xt, t); /* Convert %Z to "GMT" and %z to "+0000"; * on hosts that do not have a time zone string in struct tm, * strftime must assume its argument is local time. diff --git a/server/util_time.c b/server/util_time.c index 5b33e3ff4e..e9131a1602 100644 --- a/server/util_time.c +++ b/server/util_time.c @@ -130,7 +130,7 @@ static apr_status_t cached_explode(apr_time_exp_t *xt, apr_time_t t, (seconds != cache_element_snapshot.t_validate)) { /* Invalid snapshot */ if (use_gmt) { - return apr_explode_gmt(xt, t); + return apr_time_exp_gmt(xt, t); } else { return apr_explode_localtime(xt, t); @@ -145,7 +145,7 @@ static apr_status_t cached_explode(apr_time_exp_t *xt, apr_time_t t, else { apr_status_t r; if (use_gmt) { - r = apr_explode_gmt(xt, t); + r = apr_time_exp_gmt(xt, t); } else { r = apr_explode_localtime(xt, t); diff --git a/support/rotatelogs.c b/support/rotatelogs.c index b71e44533c..834a522976 100644 --- a/support/rotatelogs.c +++ b/support/rotatelogs.c @@ -164,7 +164,7 @@ int main (int argc, char *argv[]) apr_time_exp_t e; apr_size_t rs; - apr_explode_gmt(&e, tNow); + apr_time_exp_gmt(&e, tNow); apr_strftime(buf2, &rs, sizeof(buf2), szLogRoot, &e); } else {