httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jor...@apache.org
Subject svn commit: r225797 - /httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c
Date Thu, 28 Jul 2005 15:13:56 GMT
Author: jorton
Date: Thu Jul 28 08:13:51 2005
New Revision: 225797

URL: http://svn.apache.org/viewcvs?rev=225797&view=rev
Log:
* modules/ldap/util_ldap_cache_mgr.c (util_ald_cache_display): Replace
ap_rputs(apr_psprintf(...)) with simpler ap_rprintf(...).

Modified:
    httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c

Modified: httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c?rev=225797&r1=225796&r2=225797&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c (original)
+++ httpd/httpd/trunk/modules/ldap/util_ldap_cache_mgr.c Thu Jul 28 08:13:51 2005
@@ -576,18 +576,18 @@
                 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 @@
                     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"



Mime
View raw message