You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by se...@apache.org on 2008/03/18 22:40:51 UTC

svn commit: r638595 - /webservices/axis2/trunk/c/util/src/string_util.c

Author: senaka
Date: Tue Mar 18 14:40:48 2008
New Revision: 638595

URL: http://svn.apache.org/viewvc?rev=638595&view=rev
Log:
Fixing JIRA Issue AXIS2C-1070. Applying Manoj's patch with some other fixes too.

Modified:
    webservices/axis2/trunk/c/util/src/string_util.c

Modified: webservices/axis2/trunk/c/util/src/string_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string_util.c?rev=638595&r1=638594&r2=638595&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Tue Mar 18 14:40:48 2008
@@ -1,4 +1,3 @@
-
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
  * contributor license agreements.  See the NOTICE file distributed with
@@ -22,8 +21,8 @@
 
 AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
 axutil_tokenize(
-    const axutil_env_t * env,
-    axis2_char_t * in,
+    const axutil_env_t *env,
+    axis2_char_t *in,
     int delim)
 {
     axutil_array_list_t *list = NULL;
@@ -34,7 +33,7 @@
 
     axis2_char_t *index = NULL;
 
-    if (!in || axutil_strcmp(in, "") == 0)
+    if (!in || !*in)
     {
         return NULL;
     }
@@ -50,7 +49,7 @@
     do
     {
         index = strchr(str, delim);
-        if ((!index) && (str) && axutil_strcmp(str, "") != 0)
+        if ((!index) && str && *str)
         {
             axutil_array_list_add(list, env,
                                   axutil_strdup(env, str));
@@ -59,14 +58,13 @@
 
         rest = index + 1;
         str[index - str] = '\0';
-        if ((list) && (str) && axutil_strcmp(str, "") != 0)
+        if (str && *str)
         {
-
             axutil_array_list_add(list, env, 
                                   axutil_strdup(env, str));
         }
 
-        if (!rest || axutil_strcmp(rest, "") == 0)
+        if (!rest || !*rest)
         {
             break;
         }
@@ -85,17 +83,16 @@
 
 AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
 axutil_first_token(
-    const axutil_env_t * env,
-    axis2_char_t * in,
+    const axutil_env_t *env,
+    axis2_char_t *in,
     int delim)
 {
     axutil_array_list_t *list = NULL;
     axis2_char_t *str = NULL;
     axis2_char_t *rest = NULL;
     axis2_char_t *index = NULL;
-    AXIS2_ENV_CHECK(env, NULL);
 
-    if (!in && (axutil_strcmp(in, "") == 0))
+    if (!in && !*in)
     {
         return NULL;
     }
@@ -125,17 +122,16 @@
 
 AXIS2_EXTERN axutil_array_list_t *AXIS2_CALL
 axutil_last_token(
-    const axutil_env_t * env,
-    axis2_char_t * in,
+    const axutil_env_t *env,
+    axis2_char_t *in,
     int delim)
 {
     axutil_array_list_t *list = NULL;
     axis2_char_t *str = NULL;
     axis2_char_t *rest = NULL;
     axis2_char_t *index = NULL;
-    AXIS2_ENV_CHECK(env, NULL);
 
-    if (!in && (axutil_strcmp(in, "") == 0))
+    if (!in && !*in)
     {
         return NULL;
     }



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org