* 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 83a2655982b06f78a07ffc1bd79f2928b3fe7561..48018d19739f03608702340e01bce3c2c72d8312 100644 (file)
--- 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, 
-                     "<p>\n"
-                     "<table border='0'>\n"
-                     "<tr>\n"
-                     "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Cache Name:</b></font></td>"
-                     "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%s (%s)</b></font></td>"
-                     "</tr>\n"
-                     "</table>\n</p>\n",
-                 buf,
-                 cachetype[0] == 'm'? "Main" : 
-                                  (cachetype[0] == 's' ? "Search" : 
-                                   (cachetype[0] == 'c' ? "Compares" : "DNCompares"))), r);
+            ap_rprintf(r,
+                       "<p>\n"
+                       "<table border='0'>\n"
+                       "<tr>\n"
+                       "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Cache Name:</b></font></td>"
+                       "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%s (%s)</b></font></td>"
+                       "</tr>\n"
+                       "</table>\n</p>\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, 
-                            "<p>\n"
-                            "<table border='0'>\n"
-                            "<tr>\n"
-                            "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Size:</b></font></td>"
-                            "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%ld</b></font></td>"
-                            "</tr>\n"
-                            "<tr>\n"
-                            "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Max Entries:</b></font></td>"
-                            "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%ld</b></font></td>"
-                            "</tr>\n"
-                            "<tr>\n"
-                            "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b># Entries:</b></font></td>"
-                            "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%ld</b></font></td>"
-                            "</tr>\n"
-                            "<tr>\n"
-                            "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Full Mark:</b></font></td>"
-                            "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%ld</b></font></td>"
-                            "</tr>\n"
-                            "<tr>\n"
-                            "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Full Mark Time:</b></font></td>"
-                            "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%s</b></font></td>"
-                            "</tr>\n"
-                            "</table>\n</p>\n",
-                        util_ldap_cache->size,
-                        util_ldap_cache->maxentries,
-                        util_ldap_cache->numentries,
-                        util_ldap_cache->fullmark,
-                        date_str), r);
+                    ap_rprintf(r,
+                               "<p>\n"
+                               "<table border='0'>\n"
+                               "<tr>\n"
+                               "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Size:</b></font></td>"
+                               "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%ld</b></font></td>"
+                               "</tr>\n"
+                               "<tr>\n"
+                               "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Max Entries:</b></font></td>"
+                               "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%ld</b></font></td>"
+                               "</tr>\n"
+                               "<tr>\n"
+                               "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b># Entries:</b></font></td>"
+                               "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%ld</b></font></td>"
+                               "</tr>\n"
+                               "<tr>\n"
+                               "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Full Mark:</b></font></td>"
+                               "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%ld</b></font></td>"
+                               "</tr>\n"
+                               "<tr>\n"
+                               "<td bgcolor='#000000'><font size='-1' face='Arial,Helvetica' color='#ffffff'><b>Full Mark Time:</b></font></td>"
+                               "<td bgcolor='#ffffff'><font size='-1' face='Arial,Helvetica' color='#000000'><b>%s</b></font></td>"
+                               "</tr>\n"
+                               "</table>\n</p>\n",
+                               util_ldap_cache->size,
+                               util_ldap_cache->maxentries,
+                               util_ldap_cache->numentries,
+                               util_ldap_cache->fullmark,
+                               date_str);
 
                     ap_rputs("<p>\n"
                              "<table border='0'>\n"