You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ge...@apache.org on 2010/05/19 06:54:18 UTC

svn commit: r946026 - in /trafficserver/traffic/trunk/proxy/mgmt2: cli2/ConfigCmd.cc web2/WebHttp.cc web2/WebHttpRender.cc

Author: georgep
Date: Wed May 19 04:54:18 2010
New Revision: 946026

URL: http://svn.apache.org/viewvc?rev=946026&view=rev
Log:
TS-253: Remaining fixes for FBSD 32 bit builds
Tested: FreeBSD-8.2-32bit

Modified:
    trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
    trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
    trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc

Modified: trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc?rev=946026&r1=946025&r2=946026&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/cli2/ConfigCmd.cc Wed May 19 04:54:18 2010
@@ -5806,7 +5806,7 @@ ConfigRadiusKeys(const char *record)
   time_t my_time_t;
   time(&my_time_t);
   memset(file_path, 0, 1024);
-  snprintf(file_path, 1024, "%s%spwd_%ld.enc", dir_path, DIR_SEP, my_time_t);
+  snprintf(file_path, 1024, "%s%spwd_%lld.enc", dir_path, DIR_SEP, (ink64)my_time_t);
   if (dir_path)
     xfree(dir_path);
 

Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc?rev=946026&r1=946025&r2=946026&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttp.cc Wed May 19 04:54:18 2010
@@ -488,7 +488,7 @@ encryptToFileAuth_malloc(const char *pas
   time_t my_time_t;
   time(&my_time_t);
   memset(file_path, 0, MAX_TMP_BUF_LEN);
-  snprintf(file_path, MAX_TMP_BUF_LEN, "%s%spwd_%ld.enc", dir_path, DIR_SEP, my_time_t);
+  snprintf(file_path, MAX_TMP_BUF_LEN, "%s%spwd_%lld.enc", dir_path, DIR_SEP, (ink64)my_time_t);
   if (dir_path)
     xfree(dir_path);
 

Modified: trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc?rev=946026&r1=946025&r2=946026&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc (original)
+++ trafficserver/traffic/trunk/proxy/mgmt2/web2/WebHttpRender.cc Wed May 19 04:54:18 2010
@@ -746,7 +746,7 @@ handle_summary_object(WebHttpContext * w
     char *r = ink_ctime_r(&upTime, dateBuf);
     if (r != NULL) {
       HtmlRndrText(output, dict_ht, HTML_ID_UP_SINCE);
-      snprintf(tmpBuf, sizeof(tmpBuf), ": %s (%ld:%02ld:%02ld:%02ld)", dateBuf, d, h, m, s);
+      snprintf(tmpBuf, sizeof(tmpBuf), ": %s (%lld:%02lld:%02lld:%02lld)", dateBuf, (ink64)d, (ink64)h, (ink64)m, (ink64)s);
       output->copyFrom(tmpBuf, strlen(tmpBuf));
       HtmlRndrBr(output);
     }