You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by rj...@apache.org on 2008/01/11 00:38:51 UTC

svn commit: r610990 - /tomcat/connectors/trunk/jk/native/common/jk_status.c

Author: rjung
Date: Thu Jan 10 15:38:47 2008
New Revision: 610990

URL: http://svn.apache.org/viewvc?rev=610990&view=rev
Log:
Only use arg if set.

Modified:
    tomcat/connectors/trunk/jk/native/common/jk_status.c

Modified: tomcat/connectors/trunk/jk/native/common/jk_status.c
URL: http://svn.apache.org/viewvc/tomcat/connectors/trunk/jk/native/common/jk_status.c?rev=610990&r1=610989&r2=610990&view=diff
==============================================================================
--- tomcat/connectors/trunk/jk/native/common/jk_status.c (original)
+++ tomcat/connectors/trunk/jk/native/common/jk_status.c Thu Jan 10 15:38:47 2008
@@ -1470,7 +1470,7 @@
     status_get_string(p, JK_STATUS_ARG_MIME, NULL, &arg, l);
     mime = status_mime_int(arg);
     hide_members = status_get_int(p, JK_STATUS_ARG_OPTIONS, 0, l) &
-                                JK_STATUS_ARG_OPTION_NO_MEMBERS;
+                                  JK_STATUS_ARG_OPTION_NO_MEMBERS;
     if (w->read_only) {
         read_only = 1;
     }
@@ -1802,7 +1802,8 @@
                 status_get_string(p, JK_STATUS_ARG_CMD, NULL, &arg, l);
                 status_start_form(s, p, "get", JK_STATUS_CMD_EDIT, NULL, l);
                 jk_printf(s, JK_STATUS_FORM_HIDDEN_STRING, JK_STATUS_ARG_WORKER, name);
-                jk_printf(s, JK_STATUS_FORM_HIDDEN_STRING, JK_STATUS_ARG_FROM, arg);
+                if (arg)
+                    jk_printf(s, JK_STATUS_FORM_HIDDEN_STRING, JK_STATUS_ARG_FROM, arg);
                 jk_puts(s, "<table><tr><td><b>E</b>dit this attribute for all members:</td><td>");
                 jk_putv(s, "<select name=\"", JK_STATUS_ARG_ATTRIBUTE,
                         "\" size=\"1\">\n", NULL);
@@ -2385,10 +2386,10 @@
 }
 
 static int commit_member(jk_ws_service_t *s,
-                          status_endpoint_t *p,
-                          worker_record_t *wr,
-                          const char *lb_name,
-                          jk_logger_t *l)
+                         status_endpoint_t *p,
+                         worker_record_t *wr,
+                         const char *lb_name,
+                         jk_logger_t *l)
 {
     const char *arg;
     status_worker_t *w = p->worker;



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org