From: Joe Orton
Date: Thu, 28 Jul 2005 15:13:51 +0000 (+0000)
Subject: * modules/ldap/util_ldap_cache_mgr.c (util_ald_cache_display): Replace
X-Git-Tag: 2.1.7~5^2~57
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d8af9c446c82a69a3f4e19f6e8633d1265d610ef;p=apache
* modules/ldap/util_ldap_cache_mgr.c (util_ald_cache_display): Replace
ap_rputs(apr_psprintf(...)) with simpler ap_rprintf(...).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225797 13f79535-47bb-0310-9956-ffa450edef68
---
diff --git a/modules/ldap/util_ldap_cache_mgr.c b/modules/ldap/util_ldap_cache_mgr.c
index 83a2655982..48018d1973 100644
--- a/modules/ldap/util_ldap_cache_mgr.c
+++ b/modules/ldap/util_ldap_cache_mgr.c
@@ -576,18 +576,18 @@ char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st)
buf = "";
}
- ap_rputs(apr_psprintf(r->pool,
- "\n"
- "
\n"
- "\n"
- "Cache Name: | "
- "%s (%s) | "
- "
\n"
- "
\n
\n",
- buf,
- cachetype[0] == 'm'? "Main" :
- (cachetype[0] == 's' ? "Search" :
- (cachetype[0] == 'c' ? "Compares" : "DNCompares"))), r);
+ ap_rprintf(r,
+ "\n"
+ "
\n"
+ "\n"
+ "Cache Name: | "
+ "%s (%s) | "
+ "
\n"
+ "
\n\n",
+ buf,
+ cachetype[0] == 'm'? "Main" :
+ (cachetype[0] == 's' ? "Search" :
+ (cachetype[0] == 'c' ? "Compares" : "DNCompares")));
switch (cachetype[0]) {
case 'm':
@@ -597,35 +597,35 @@ char *util_ald_cache_display(request_rec *r, util_ldap_state_t *st)
else
date_str[0] = 0;
- ap_rputs(apr_psprintf(r->pool,
- "\n"
- "
\n"
- "\n"
- "Size: | "
- "%ld | "
- "
\n"
- "\n"
- "Max Entries: | "
- "%ld | "
- "
\n"
- "\n"
- "# Entries: | "
- "%ld | "
- "
\n"
- "\n"
- "Full Mark: | "
- "%ld | "
- "
\n"
- "\n"
- "Full Mark Time: | "
- "%s | "
- "
\n"
- "
\n\n",
- util_ldap_cache->size,
- util_ldap_cache->maxentries,
- util_ldap_cache->numentries,
- util_ldap_cache->fullmark,
- date_str), r);
+ ap_rprintf(r,
+ "\n"
+ "
\n"
+ "\n"
+ "Size: | "
+ "%ld | "
+ "
\n"
+ "\n"
+ "Max Entries: | "
+ "%ld | "
+ "
\n"
+ "\n"
+ "# Entries: | "
+ "%ld | "
+ "
\n"
+ "\n"
+ "Full Mark: | "
+ "%ld | "
+ "
\n"
+ "\n"
+ "Full Mark Time: | "
+ "%s | "
+ "
\n"
+ "
\n\n",
+ util_ldap_cache->size,
+ util_ldap_cache->maxentries,
+ util_ldap_cache->numentries,
+ util_ldap_cache->fullmark,
+ date_str);
ap_rputs("\n"
"