From 6b484e7e602dfa886aeb3fc9795c22842b7816a0 Mon Sep 17 00:00:00 2001 From: Brian Pane Date: Sun, 30 Jun 2002 04:30:41 +0000 Subject: [PATCH] Replaced APR_USEC_PER_SEC division with the new apr_time_sec() macro git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95916 13f79535-47bb-0310-9956-ffa450edef68 --- modules/metadata/mod_expires.c | 10 ++++++---- modules/metadata/mod_mime_magic.c | 2 +- modules/metadata/mod_unique_id.c | 6 ++++-- modules/metadata/mod_usertrack.c | 2 +- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/modules/metadata/mod_expires.c b/modules/metadata/mod_expires.c index 7de3efca83..a11475e95a 100644 --- a/modules/metadata/mod_expires.c +++ b/modules/metadata/mod_expires.c @@ -423,6 +423,7 @@ static int add_expires(request_rec *r) apr_time_t base; apr_time_t additional; apr_time_t expires; + int additional_sec; char *timestr; if (ap_is_HTTP_ERROR(r->status)) /* Don't add Expires headers to errors */ @@ -477,14 +478,16 @@ static int add_expires(request_rec *r) return DECLINED; } base = r->finfo.mtime; - additional = atoi(&code[1]) * APR_USEC_PER_SEC; + additional_sec = atoi(&code[1]); + additional = apr_time_from_sec(additional_sec); break; case 'A': /* there's been some discussion and it's possible that * 'access time' will be stored in request structure */ base = r->request_time; - additional = atoi(&code[1]) * APR_USEC_PER_SEC; + additional_sec = atoi(&code[1]); + additional = apr_time_from_sec(additional_sec); break; default: /* expecting the add_* routines to be case-hardened this @@ -498,8 +501,7 @@ static int add_expires(request_rec *r) expires = base + additional; apr_table_mergen(r->headers_out, "Cache-Control", apr_psprintf(r->pool, "max-age=%qd", - (expires - r->request_time) - / APR_USEC_PER_SEC)); + apr_time_sec(expires - r->request_time))); timestr = apr_palloc(r->pool, APR_RFC822_DATE_LEN); apr_rfc822_date(timestr, expires); apr_table_setn(r->headers_out, "Expires", timestr); diff --git a/modules/metadata/mod_mime_magic.c b/modules/metadata/mod_mime_magic.c index 7fa96f53c2..53161bc099 100644 --- a/modules/metadata/mod_mime_magic.c +++ b/modules/metadata/mod_mime_magic.c @@ -1760,7 +1760,7 @@ static void mprint(request_rec *r, union VALUETYPE *p, struct magic *m) case DATE: case BEDATE: case LEDATE: - apr_ctime(time_str, APR_USEC_PER_SEC * (apr_time_t)*(time_t *)&p->l); + apr_ctime(time_str, apr_time_from_sec(*(time_t *)&p->l)); pp = time_str; (void) magic_rsl_printf(r, m->desc, pp); return; diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c index 6423945655..393f5aa1d0 100644 --- a/modules/metadata/mod_unique_id.c +++ b/modules/metadata/mod_unique_id.c @@ -179,6 +179,7 @@ static int unique_id_global_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pt apr_status_t rv; char *ipaddrstr; apr_sockaddr_t *sockaddr; + apr_time_t now; /* * Calculate the sizes and offsets in cur_unique_id. @@ -251,7 +252,8 @@ static int unique_id_global_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *pt * But protecting against it is relatively cheap. We just sleep into the * next second. */ - pause = (apr_short_interval_time_t)(1000000 - (apr_time_now() % APR_USEC_PER_SEC)); + now = apr_time_now(); + pause = (apr_short_interval_time_t)(1000000 - apr_time_usec(now)); apr_sleep(pause); return OK; } @@ -295,7 +297,7 @@ static void unique_id_child_init(apr_pool_t *p, server_rec *s) /* Some systems have very low variance on the low end of their system * counter, defend against that. */ - cur_unique_id.counter = (unsigned short)(tv % APR_USEC_PER_SEC / 10); + cur_unique_id.counter = (unsigned short)(apr_time_usec(tv) / 10); /* * We must always use network ordering for these bytes, so that diff --git a/modules/metadata/mod_usertrack.c b/modules/metadata/mod_usertrack.c index 39e58a697b..a05e83bb2c 100644 --- a/modules/metadata/mod_usertrack.c +++ b/modules/metadata/mod_usertrack.c @@ -157,7 +157,7 @@ static void make_cookie(request_rec *r) if ((dcfg->style == CT_UNSET) || (dcfg->style == CT_NETSCAPE)) { apr_time_exp_t tms; apr_time_exp_gmt(&tms, r->request_time - + cls->expires * APR_USEC_PER_SEC); + + apr_time_from_sec(cls->expires)); new_cookie = apr_psprintf(r->pool, "%s; expires=%s, " "%.2d-%s-%.2d %.2d:%.2d:%.2d GMT", -- 2.50.1