You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/03/20 22:30:52 UTC
svn commit: r1827366 - in /httpd/httpd/trunk/modules/ldap: util_ldap_cache.c
util_ldap_cache_mgr.c
Author: ylavic
Date: Tue Mar 20 22:30:52 2018
New Revision: 1827366
URL: http://svn.apache.org/viewvc?rev=1827366&view=rev
Log:
mod_ldap: fix format warnings.
Modified:
httpd/httpd/trunk/modules/ldap/util_ldap_cache.c
httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c
Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap_cache.c?rev=1827366&r1=1827365&r2=1827366&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap_cache.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap_cache.c Tue Mar 20 22:30:52 2018
@@ -113,7 +113,7 @@ void util_ldap_url_node_display(request_
"<td nowrap>%ld</td>"
"<td nowrap>%ld</td>"
"<td nowrap>%ld</td>"
- "<td nowrap>%ld</td>"
+ "<td nowrap>%" APR_TIME_T_FMT "</td>"
"<td nowrap>%ld</td>"
"<td nowrap>%s</td>"
"</tr>",
@@ -122,7 +122,7 @@ void util_ldap_url_node_display(request_
cache_node->size,
cache_node->maxentries,
cache_node->numentries,
- cache_node->ttl / APR_USEC_PER_SEC,
+ apr_time_sec(cache_node->ttl),
cache_node->fullmark,
date_str);
}
Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c?rev=1827366&r1=1827365&r2=1827366&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c Tue Mar 20 22:30:52 2018
@@ -741,7 +741,7 @@ char *util_ald_cache_display(request_rec
"</tr>\n"
"<tr>\n"
"<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>TTL (sec):</b></font></td>"
- "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%ld</b></font></td>"
+ "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%" APR_TIME_T_FMT "</b></font></td>"
"</tr>\n"
"<tr>\n"
"<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Full Mark:</b></font></td>"
@@ -755,7 +755,7 @@ char *util_ald_cache_display(request_rec
util_ldap_cache->size,
util_ldap_cache->maxentries,
util_ldap_cache->numentries,
- util_ldap_cache->ttl / APR_USEC_PER_SEC,
+ apr_time_sec(util_ldap_cache->ttl),
util_ldap_cache->fullmark,
date_str);