From 0d60d8b41df0082631da6fc05f239f9f44b187ea Mon Sep 17 00:00:00 2001 From: konn Date: Fri, 9 Jun 2006 07:29:00 +0000 Subject: [PATCH] *** empty log message *** git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/modchxj/mod_chxj/trunk@324 1a406e8e-add9-4483-a2c8-d8cac5b7c224 --- src/chxj_chtml10.c | 3 +-- src/chxj_hdml.c | 7 +++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/chxj_chtml10.c b/src/chxj_chtml10.c index 1409e5bf..1686400e 100644 --- a/src/chxj_chtml10.c +++ b/src/chxj_chtml10.c @@ -1505,8 +1505,7 @@ s_chtml10_start_option_tag(chtml10_t* chtml10, Node* child) selected = apr_pstrdup(r->pool, val); } else - if (strcasecmp(nm, "value") == 0) - { + if ((*nm == 'v' || *nm == 'V') && strcasecmp(nm, "value") == 0) { /*----------------------------------------------------------------------*/ /* CHTML 1.0 version 2.0 */ /*----------------------------------------------------------------------*/ diff --git a/src/chxj_hdml.c b/src/chxj_hdml.c index 5c5fe749..8944ac28 100644 --- a/src/chxj_hdml.c +++ b/src/chxj_hdml.c @@ -150,8 +150,7 @@ chxj_exchange_hdml(request_rec* r, ); dst = apr_pstrdup(r->pool, hdml.out); } - else - { + else { /*------------------------------------------------------------------------*/ /* Here, the parsing of the received character string is done */ /*------------------------------------------------------------------------*/ @@ -184,8 +183,7 @@ chxj_exchange_hdml(request_rec* r, /* When there is no processing result, former character string is copied */ /* and it returns it. */ /*--------------------------------------------------------------------------*/ - if (dst == NULL) - { + if (!dst) { *dstlen = srclen; return apr_pstrdup(r->pool,src); } @@ -196,6 +194,7 @@ chxj_exchange_hdml(request_rec* r, /* Null is set at the end of the character string to make sure. */ /*--------------------------------------------------------------------------*/ dst[hdml.out_len] = 0; + return dst; } -- 2.11.0