Add an apr_short_interval_time. This allows us to use an apr_interval_time

for apr_time_t - apr_time_t values.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88181 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/generators/mod_status.c b/modules/generators/mod_status.c
index 546dc0cca6ab92cffb69661215e995994b3ac4d2..d83321abd54fea0f8697178fee517415538a1f82 100644 (file)
--- a/modules/generators/mod_status.c
+++ b/modules/generators/mod_status.c
@@ -184,7 +184,7 @@ static void format_kbyte_out(request_rec *r, unsigned long kbytes)
 
 static void show_time(request_rec *r, apr_interval_time_t tsecs) 
 {
-    apr_time_t days, hrs, mins, secs;
+    int days, hrs, mins, secs;
     
     secs = tsecs % 60;
     tsecs /= 60;
@@ -193,13 +193,13 @@ static void show_time(request_rec *r, apr_interval_time_t tsecs)
     hrs = tsecs % 24;
     days = tsecs / 24;
     if (days)
-       ap_rprintf(r, " %qd day%s", days, days == 1 ? "" : "s");
+       ap_rprintf(r, " %d day%s", days, days == 1 ? "" : "s");
     if (hrs)
-       ap_rprintf(r, " %qd hour%s", hrs, hrs == 1 ? "" : "s");
+       ap_rprintf(r, " %d hour%s", hrs, hrs == 1 ? "" : "s");
     if (mins)
-       ap_rprintf(r, " %qd minute%s", mins, mins == 1 ? "" : "s");
+       ap_rprintf(r, " %d minute%s", mins, mins == 1 ? "" : "s");
     if (secs)
-       ap_rprintf(r, " %qd second%s", secs, secs == 1 ? "" : "s");
+       ap_rprintf(r, " %d second%s", secs, secs == 1 ? "" : "s");
 }
 
 /* Main handler for x-httpd-status requests */

diff --git a/modules/metadata/mod_unique_id.c b/modules/metadata/mod_unique_id.c
index 9fd0d2dca9d1f0686e05930aa498f539bc103b5a..1e1f6bf1c88e91e58c2a5ba0d9d00ab13f1429f2 100644 (file)
--- a/modules/metadata/mod_unique_id.c
+++ b/modules/metadata/mod_unique_id.c
@@ -182,7 +182,7 @@ static void unique_id_global_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *p
 #endif
     char str[MAXHOSTNAMELEN + 1];
     struct hostent *hent;
-    apr_interval_time_t pause;
+    apr_short_interval_time_t pause;
 
     /*
      * Calculate the sizes and offsets in cur_unique_id.
@@ -243,7 +243,7 @@ static void unique_id_global_init(apr_pool_t *p, apr_pool_t *plog, apr_pool_t *p
      * But protecting against it is relatively cheap.  We just sleep into the
      * next second.
      */
-    pause = (apr_interval_time_t)(1000000 - (apr_time_now() % APR_USEC_PER_SEC));
+    pause = (apr_short_interval_time_t)(1000000 - (apr_time_now() % APR_USEC_PER_SEC));
     apr_sleep(pause);
 }