axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sam...@apache.org
Subject svn commit: r447671 [5/8] - in /webservices/axis2/trunk/c: axiom/src/attachments/ axiom/src/om/ axiom/src/parser/libxml2/ axiom/src/soap/ axiom/src/util/ axiom/test/om/ axiom/test/soap/ guththila/src/ modules/core/addr/ modules/core/clientapi/ modules/...
Date Tue, 19 Sep 2006 01:39:11 GMT
Modified: webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/test/unit/codegen/w2c_writer_test.c Mon Sep 18 18:39:03 2006
@@ -74,7 +74,7 @@
     writer = (w2c_writer_t*)w2c_class_loader_get_object_from_class_name
             (env, "w2c_cservice_xml_writer", "/codegen/writers/", &dll_desc);
     CuAssertPtrNotNull(tc, writer);
-    if (writer != NULL)
+    if (writer)
     {
         W2C_WRITER_INITIALIZE(writer, env, loader, conf);
         W2C_WRITER_CREATE_OUT_FILE(writer, env, NULL, NULL);

Modified: webservices/axis2/trunk/c/tools/tcpmon/src/entry.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/tcpmon/src/entry.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/tools/tcpmon/src/entry.c (original)
+++ webservices/axis2/trunk/c/tools/tcpmon/src/entry.c Mon Sep 18 18:39:03 2006
@@ -541,9 +541,9 @@
         {
             *(buffer + read_size) = '\0';
             current_line = buffer + current_line_offset;
-            if (NULL != strstr(current_line, "Content-Length"))
+            if (strstr(current_line, "Content-Length"))
             {
-                if (NULL != (length_char = strstr(current_line, ":")))
+                if ((length_char = strstr(current_line, ":")))
                 {
                     length_char++;
                     length = atoi(length_char);

Modified: webservices/axis2/trunk/c/util/src/dir_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dir_handler.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/dir_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/dir_handler.c Mon Sep 18 18:39:03 2006
@@ -203,7 +203,7 @@
 
     axis2_status_t status = AXIS2_FAILURE;
     AXIS2_ENV_CHECK(env, NULL);
-    /*if ((handle = opendir(pathname)) != NULL && (handle->finished == 1))
+    /*if ((handle = opendir(pathname))  && (handle->finished == 1))
     {
        printf("Path Name does not exist:%s\n",pathname);
        return NULL;
@@ -366,7 +366,7 @@
 
     /* Check for filename extensions */
     ptr = AXIS2_RINDEX(entry->d_name, '.');
-    if ((ptr != NULL) &&
+    if ((ptr) &&
             ((strcmp(ptr, AXIS2_LIB_SUFFIX) == 0)))
     {
         return (AXIS2_TRUE);
@@ -390,7 +390,7 @@
 
     /* Check for filename extensions */
     /*ptr = AXIS2_RINDEX(entry->d_name, '.');
-    if (ptr != NULL)
+    if (ptr )
      {
        return (AXIS2_FALSE);
      }*/

Modified: webservices/axis2/trunk/c/util/src/dll_desc.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/dll_desc.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/dll_desc.c (original)
+++ webservices/axis2/trunk/c/util/src/dll_desc.c Mon Sep 18 18:39:03 2006
@@ -215,7 +215,7 @@
         dll_desc_impl->path_qualified_dll_name = NULL;
     }
 
-    if (NULL != dll_desc->ops)
+    if (dll_desc->ops)
     {
         AXIS2_FREE(env->allocator, dll_desc->ops);
         dll_desc->ops = NULL;

Modified: webservices/axis2/trunk/c/util/src/env.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/env.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/env.c (original)
+++ webservices/axis2/trunk/c/util/src/env.c Mon Sep 18 18:39:03 2006
@@ -38,7 +38,7 @@
     log = axis2_log_create(allocator, NULL, log_file);
     thread_pool = axis2_thread_pool_init(allocator);
     env = axis2_env_create_with_error_log_thread_pool(allocator, error, log, thread_pool);
-    if (NULL != env->log)
+    if (env->log)
     {
         env->log->level = log_level;
     }
@@ -49,16 +49,16 @@
 
 AXIS2_EXTERN axis2_status_t AXIS2_CALL  axis2_env_free(axis2_env_t *env)
 {
-    if (NULL != env && NULL != env->log)
+    if (env && NULL != env->log)
         AXIS2_LOG_FREE(env->allocator, env->log);
 
-    if (NULL != env && NULL != env->error)
+    if (env && NULL != env->error)
         AXIS2_ERROR_FREE(env->error);
 
-    if (NULL != env && NULL != env->thread_pool)
+    if (env && NULL != env->thread_pool)
         AXIS2_THREAD_POOL_FREE(env->thread_pool);
 
-    if (NULL != env)
+    if (env)
         free(env);
 
     return 0;
@@ -210,7 +210,7 @@
     {
         AXIS2_THREAD_POOL_FREE(env->thread_pool);
     }
-    if (NULL != env)
+    if (env)
         free(env);
     return AXIS2_SUCCESS;
 }

Modified: webservices/axis2/trunk/c/util/src/error.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/error.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/error.c (original)
+++ webservices/axis2/trunk/c/util/src/error.c Mon Sep 18 18:39:03 2006
@@ -472,11 +472,11 @@
 axis2_status_t AXIS2_CALL
 axis2_error_impl_free(axis2_error_t *error)
 {
-    if (NULL != error && NULL != error->ops)
+    if (error && NULL != error->ops)
     {
         free(error->ops);
     }
-    if (NULL != error)
+    if (error)
     {
         free(error);
     }

Modified: webservices/axis2/trunk/c/util/src/hash.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/hash.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/hash.c (original)
+++ webservices/axis2/trunk/c/util/src/hash.c Mon Sep 18 18:39:03 2006
@@ -287,7 +287,7 @@
         return hep;
 
     /* add a new entry for non-NULL values */
-    if ((he = ht->free) != NULL)
+    if ((he = ht->free))
         ht->free = he->next;
     else
         he = AXIS2_MALLOC(ht->env->allocator, sizeof(*he));

Modified: webservices/axis2/trunk/c/util/src/linked_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/linked_list.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/linked_list.c (original)
+++ webservices/axis2/trunk/c/util/src/linked_list.c Mon Sep 18 18:39:03 2006
@@ -308,14 +308,14 @@
 
     linked_list_impl = AXIS2_INTF_TO_IMPL(linked_list);
 
-    if (NULL != linked_list_impl->linked_list.ops)
+    if (linked_list_impl->linked_list.ops)
     {
         AXIS2_FREE(env->allocator, linked_list_impl->linked_list.ops);
         linked_list_impl->linked_list.ops = NULL;
     }
 
     current = linked_list_impl->first;
-    while (NULL != current)
+    while (current)
     {
         next = current->next;
         AXIS2_FREE(env->allocator, current);
@@ -510,7 +510,7 @@
     AXIS2_INTF_TO_IMPL(linked_list)->size--;
     r = AXIS2_INTF_TO_IMPL(linked_list)->first->data;
 
-    if (AXIS2_INTF_TO_IMPL(linked_list)->first->next != NULL)
+    if (AXIS2_INTF_TO_IMPL(linked_list)->first->next)
         AXIS2_INTF_TO_IMPL(linked_list)->first->next->previous = NULL;
     else
         AXIS2_INTF_TO_IMPL(linked_list)->last = NULL;
@@ -543,7 +543,7 @@
     AXIS2_INTF_TO_IMPL(linked_list)->size--;
     r = AXIS2_INTF_TO_IMPL(linked_list)->last->data;
 
-    if (AXIS2_INTF_TO_IMPL(linked_list)->last->previous != NULL)
+    if (AXIS2_INTF_TO_IMPL(linked_list)->last->previous)
         AXIS2_INTF_TO_IMPL(linked_list)->last->previous->next = NULL;
     else
         AXIS2_INTF_TO_IMPL(linked_list)->first = NULL;
@@ -620,7 +620,7 @@
     AXIS2_PARAM_CHECK(env->error, o, AXIS2_FALSE);
 
     e = AXIS2_INTF_TO_IMPL(linked_list)->first;
-    while (e != NULL)
+    while (e)
     {
         if (o == e->data)
             return AXIS2_TRUE;
@@ -677,7 +677,7 @@
     AXIS2_PARAM_CHECK(env->error, o, AXIS2_FALSE);
 
     e = AXIS2_INTF_TO_IMPL(linked_list)->first;
-    while (e != NULL)
+    while (e)
     {
         if (o == e->data)
         {
@@ -823,7 +823,7 @@
     AXIS2_PARAM_CHECK(env->error, o, AXIS2_FAILURE);
 
     e = AXIS2_INTF_TO_IMPL(linked_list)->first;
-    while (e != NULL)
+    while (e)
     {
         if (o == e->data)
             return index;
@@ -851,7 +851,7 @@
 
     index = AXIS2_INTF_TO_IMPL(linked_list)->size - 1;
     e = AXIS2_INTF_TO_IMPL(linked_list)->last;
-    while (e != NULL)
+    while (e)
     {
         if (o == e->data)
             return index;

Modified: webservices/axis2/trunk/c/util/src/log.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/log.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/log.c (original)
+++ webservices/axis2/trunk/c/util/src/log.c Mon Sep 18 18:39:03 2006
@@ -38,21 +38,21 @@
 {
     axis2_log_impl_t *log_impl = NULL;
 
-    if (NULL != log)
+    if (log)
     {
         log_impl = AXIS2_INTF_TO_IMPL(log);
 
-        if (NULL != log_impl->mutex)
+        if (log_impl->mutex)
         {
             axis2_thread_mutex_destroy(log_impl->mutex);
             log_impl->mutex = NULL;
         }
-        if (NULL != AXIS2_INTF_TO_IMPL(log)->stream)
+        if (AXIS2_INTF_TO_IMPL(log)->stream)
         {
             axis2_file_handler_close(log_impl->stream);
             log_impl->stream = NULL;
         }
-        if (NULL != log->ops)
+        if (log->ops)
         {
             AXIS2_FREE(allocator, log->ops);
             log->ops = NULL;
@@ -111,7 +111,7 @@
      */
     if (stream_name && !(AXIS2_RINDEX(stream_name, AXIS2_PATH_SEP_CHAR)))
     {
-        if (NULL != (path_home = AXIS2_GETENV("AXIS2C_HOME")))
+        if ((path_home = AXIS2_GETENV("AXIS2C_HOME")))
         {
             AXIS2_SNPRINTF(log_dir, 500, "%s%c%s", path_home, AXIS2_PATH_SEP_CHAR, "logs");
             if (AXIS2_SUCCESS == axis2_file_handler_access(log_dir, AXIS2_F_OK))

Modified: webservices/axis2/trunk/c/util/src/minizip/archive_extract.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/archive_extract.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/archive_extract.c (original)
+++ webservices/axis2/trunk/c/util/src/minizip/archive_extract.c Mon Sep 18 18:39:03 2006
@@ -164,7 +164,7 @@
 
         }
 
-        if (fout != NULL)
+        if (fout)
         {
             do
             {
@@ -250,7 +250,7 @@
 
     filename_to_extract = d_name;
 
-    if (zipfilename != NULL)
+    if (zipfilename)
     {
         zlib_filefunc_def ffunc;
         strncpy(filename_try, zipfilename, MAXFILENAME - 1);
@@ -317,7 +317,7 @@
                 return (AXIS2_FALSE);
 
             ptr = AXIS2_RINDEX(namelist[n]->d_name, '.');
-            if ((ptr != NULL) &&
+            if ((ptr) &&
                     (((strcmp(ptr, AXIS2_AAR_SUFFIX) == 0)) || (strcmp(ptr, AXIS2_MAR_SUFFIX) == 0)))
                 for (i = 0;i < n;i++)
                     if (strncmp(namelist[n]->d_name, namelist[i]->d_name, strlen(namelist[i]->d_name)) == 0)

Modified: webservices/axis2/trunk/c/util/src/minizip/crypt.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/crypt.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/crypt.c (original)
+++ webservices/axis2/trunk/c/util/src/minizip/crypt.c Mon Sep 18 18:39:03 2006
@@ -53,8 +53,8 @@
 int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
 {
     unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
-                             * unpredictable manner on 16-bit systems; not a problem
-                             * with any known compiler so far, though */
+                                 * unpredictable manner on 16-bit systems; not a problem
+                                 * with any known compiler so far, though */
 
     temp = ((unsigned)(*(pkeys + 2)) & 0xffff) | 2;
     return (int)(((temp *(temp ^ 1)) >> 8) & 0xff);

Modified: webservices/axis2/trunk/c/util/src/minizip/ioapi.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/ioapi.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/ioapi.c (original)
+++ webservices/axis2/trunk/c/util/src/minizip/ioapi.c Mon Sep 18 18:39:03 2006
@@ -98,7 +98,7 @@
             if (mode & ZLIB_FILEFUNC_MODE_CREATE)
                 mode_fopen = "wb";
 
-    if ((filename != NULL) && (mode_fopen != NULL))
+    if ((filename) && (mode_fopen != NULL))
         file = fopen(filename, mode_fopen);
     return file;
 }

Modified: webservices/axis2/trunk/c/util/src/minizip/iowin32.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/iowin32.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/iowin32.c (original)
+++ webservices/axis2/trunk/c/util/src/minizip/iowin32.c Mon Sep 18 18:39:03 2006
@@ -110,14 +110,14 @@
                 dwCreationDisposition = CREATE_ALWAYS;
             }
 
-    if ((filename != NULL) && (dwDesiredAccess != 0))
+    if ((filename) && (dwDesiredAccess != 0))
         hFile = CreateFile((LPCTSTR)filename, dwDesiredAccess, dwShareMode, NULL,
                 dwCreationDisposition, dwFlagsAndAttributes, NULL);
 
     if (hFile == INVALID_HANDLE_VALUE)
         hFile = NULL;
 
-    if (hFile != NULL)
+    if (hFile)
     {
         WIN32FILE_IOWIN w32fiow;
         w32fiow.hf = hFile;
@@ -139,9 +139,9 @@
 {
     uLong ret = 0;
     HANDLE hFile = NULL;
-    if (stream != NULL)
+    if (stream)
         hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    if (hFile != NULL)
+    if (hFile)
         if (!ReadFile(hFile, buf, size, &ret, NULL))
         {
             DWORD dwErr = GetLastError();
@@ -162,10 +162,10 @@
 {
     uLong ret = 0;
     HANDLE hFile = NULL;
-    if (stream != NULL)
+    if (stream)
         hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
 
-    if (hFile != NULL)
+    if (hFile)
         if (!WriteFile(hFile, buf, size, &ret, NULL))
         {
             DWORD dwErr = GetLastError();
@@ -183,9 +183,9 @@
 {
     long ret = -1;
     HANDLE hFile = NULL;
-    if (stream != NULL)
+    if (stream)
         hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-    if (hFile != NULL)
+    if (hFile)
     {
         DWORD dwSet = SetFilePointer(hFile, 0, NULL, FILE_CURRENT);
         if (dwSet == INVALID_SET_FILE_POINTER)
@@ -210,7 +210,7 @@
     HANDLE hFile = NULL;
 
     long ret = -1;
-    if (stream != NULL)
+    if (stream)
         hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
     switch (origin)
     {
@@ -227,7 +227,7 @@
             return -1;
     }
 
-    if (hFile != NULL)
+    if (hFile)
     {
         DWORD dwSet = SetFilePointer(hFile, offset, NULL, dwMoveMethod);
         if (dwSet == INVALID_SET_FILE_POINTER)
@@ -248,11 +248,11 @@
 {
     int ret = -1;
 
-    if (stream != NULL)
+    if (stream)
     {
         HANDLE hFile;
         hFile = ((WIN32FILE_IOWIN*)stream) -> hf;
-        if (hFile != NULL)
+        if (hFile)
         {
             CloseHandle(hFile);
             ret = 0;
@@ -267,7 +267,7 @@
 voidpf stream;
 {
     int ret = -1;
-    if (stream != NULL)
+    if (stream)
     {
         ret = ((WIN32FILE_IOWIN*)stream) -> error;
     }

Modified: webservices/axis2/trunk/c/util/src/minizip/unzip.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/minizip/unzip.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/minizip/unzip.c (original)
+++ webservices/axis2/trunk/c/util/src/minizip/unzip.c Mon Sep 18 18:39:03 2006
@@ -157,12 +157,12 @@
 
     uLong size_central_dir;     /* size of the central directory  */
     uLong offset_central_dir;   /* offset of start of central directory with
-                                           respect to the starting disk number */
+                                               respect to the starting disk number */
 
     unz_file_info cur_file_info; /* public info about the current file in zip*/
     unz_file_info_internal cur_file_info_internal; /* private info about it*/
     file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
-                                                file if we are decompressing it */
+                                                    file if we are decompressing it */
     int encrypted;
 #    ifndef NOUNCRYPT
     unsigned long keys[3];     /* keys defining the pseudo-random sequence */
@@ -423,12 +423,12 @@
     uLong central_pos, uL;
 
     uLong number_disk;          /* number of the current dist, used for
-                                           spaning ZIP, unsupported, always 0*/
+                                               spaning ZIP, unsupported, always 0*/
     uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                           for spaning ZIP, unsupported, always 0*/
+                                               for spaning ZIP, unsupported, always 0*/
     uLong number_entry_CD;      /* total number of entries in
-                                           the central dir
-                                           (same than number_entry on nospan) */
+                                               the central dir
+                                               (same than number_entry on nospan) */
 
     int err = UNZ_OK;
 
@@ -536,7 +536,7 @@
         return UNZ_PARAMERROR;
     s = (unz_s*)file;
 
-    if (s->pfile_in_zip_read != NULL)
+    if (s->pfile_in_zip_read)
         unzCloseCurrentFile(file);
 
     ZCLOSE(s->z_filefunc, s->filestream);
@@ -685,7 +685,7 @@
         err = UNZ_ERRNO;
 
     lSeek += file_info.size_filename;
-    if ((err == UNZ_OK) && (szFileName != NULL))
+    if ((err == UNZ_OK) && (szFileName))
     {
         uLong uSizeRead ;
         if (file_info.size_filename < fileNameBufferSize)
@@ -703,7 +703,7 @@
     }
 
 
-    if ((err == UNZ_OK) && (extraField != NULL))
+    if ((err == UNZ_OK) && (extraField))
     {
         uLong uSizeRead ;
         if (file_info.size_file_extra < extraFieldBufferSize)
@@ -727,7 +727,7 @@
         lSeek += file_info.size_file_extra;
 
 
-    if ((err == UNZ_OK) && (szComment != NULL))
+    if ((err == UNZ_OK) && (szComment))
     {
         uLong uSizeRead ;
         if (file_info.size_file_comment < commentBufferSize)
@@ -753,10 +753,10 @@
     else
         lSeek += file_info.size_file_comment;
 
-    if ((err == UNZ_OK) && (pfile_info != NULL))
+    if ((err == UNZ_OK) && (pfile_info))
         *pfile_info = file_info;
 
-    if ((err == UNZ_OK) && (pfile_info_internal != NULL))
+    if ((err == UNZ_OK) && (pfile_info_internal))
         *pfile_info_internal = file_info_internal;
 
     return err;
@@ -1090,7 +1090,7 @@
 #    ifndef NOUNCRYPT
     char source[12];
 #    else
-    if (password != NULL)
+    if (password)
         return UNZ_PARAMERROR;
 #    endif
 
@@ -1100,7 +1100,7 @@
     if (!s->current_file_ok)
         return UNZ_PARAMERROR;
 
-    if (s->pfile_in_zip_read != NULL)
+    if (s->pfile_in_zip_read)
         unzCloseCurrentFile(file);
 
     if (unzlocal_CheckCurrentFileCoherencyHeader(s, &iSizeVar,
@@ -1126,10 +1126,10 @@
 
     pfile_in_zip_read_info->stream_initialised = 0;
 
-    if (method != NULL)
+    if (method)
         *method = (int)s->cur_file_info.compression_method;
 
-    if (level != NULL)
+    if (level)
     {
         *level = 6;
         switch (s->cur_file_info.flag & 0x06)
@@ -1200,7 +1200,7 @@
     s->pfile_in_zip_read = pfile_in_zip_read_info;
 
 #    ifndef NOUNCRYPT
-    if (password != NULL)
+    if (password)
     {
         int i;
         s->pcrc_32_tab = get_crc_table();
@@ -1387,7 +1387,7 @@
             */
             err = inflate(&pfile_in_zip_read_info->stream, flush);
 
-            if ((err >= 0) && (pfile_in_zip_read_info->stream.msg != NULL))
+            if ((err >= 0) && (pfile_in_zip_read_info->stream.msg))
                 err = Z_DATA_ERROR;
 
             uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
@@ -1590,7 +1590,7 @@
             return UNZ_ERRNO;
     }
 
-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
+    if ((szComment) && (uSizeBuf > s->gi.size_comment))
         *(szComment + s->gi.size_comment) = '\0';
     return (int)uReadThis;
 }

Modified: webservices/axis2/trunk/c/util/src/network_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/network_handler.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/network_handler.c (original)
+++ webservices/axis2/trunk/c/util/src/network_handler.c Mon Sep 18 18:39:03 2006
@@ -64,7 +64,7 @@
         struct hostent* lphost = NULL;
         lphost = gethostbyname(server); /*nnn netdb.h*/
 
-        if (NULL != lphost)
+        if (lphost)
             sock_addr.sin_addr.s_addr =
                 ((struct in_addr*)lphost->h_addr)->s_addr;
         else

Modified: webservices/axis2/trunk/c/util/src/param_container.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param_container.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/param_container.c (original)
+++ webservices/axis2/trunk/c/util/src/param_container.c Mon Sep 18 18:39:03 2006
@@ -120,10 +120,10 @@
 
     param_container_impl = AXIS2_INTF_TO_IMPL(param_container);
 
-    if (NULL != param_container->ops)
+    if (param_container->ops)
         AXIS2_FREE(env->allocator, param_container->ops);
 
-    if (NULL != param_container_impl->params)
+    if (param_container_impl->params)
     {
         axis2_hash_index_t *hi = NULL;
         void *val = NULL;

Modified: webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/unix/thread_unix.c Mon Sep 18 18:39:03 2006
@@ -107,7 +107,7 @@
     new->data = data;
     new->func = func;
 
-    if (NULL != attr)
+    if (attr)
     {
         temp = &attr->attr;
     }
@@ -138,9 +138,9 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_thread_exit(axis2_thread_t *thd, axis2_allocator_t *allocator)
 {
-    if (NULL != thd)
+    if (thd)
     {
-        if (NULL != thd->td)
+        if (thd->td)
         {
             AXIS2_FREE(allocator, thd->td);
             thd->td = NULL;

Modified: webservices/axis2/trunk/c/util/src/platforms/windows/dir_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/dir_windows.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/dir_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/dir_windows.c Mon Sep 18 18:39:03 2006
@@ -182,7 +182,7 @@
         return -1;
     }
 
-    while ((dp = readdir(dirp)) != NULL)
+    while ((dp = readdir(dirp)))
     {
         int dsize = 0;
         struct dirent *newdp = NULL;

Modified: webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c (original)
+++ webservices/axis2/trunk/c/util/src/platforms/windows/thread_windows.c Mon Sep 18 18:39:03 2006
@@ -119,7 +119,7 @@
 AXIS2_EXTERN axis2_status_t AXIS2_CALL
 axis2_thread_exit(axis2_thread_t *thd, axis2_allocator_t *allocator)
 {
-    if (NULL != thd)
+    if (thd)
     {
         AXIS2_FREE(allocator, thd);
     }

Modified: webservices/axis2/trunk/c/util/src/qname.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/qname.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/qname.c (original)
+++ webservices/axis2/trunk/c/util/src/qname.c Mon Sep 18 18:39:03 2006
@@ -333,7 +333,7 @@
         axis2_char_t *temp_string1 = NULL;
         temp_string1 = AXIS2_STRACAT(qname_impl->localpart, "|", env);
         qname_impl->qname_string = AXIS2_STRACAT(temp_string1, qname_impl->namespace_uri, env);
-        if (NULL != temp_string1)
+        if (temp_string1)
         {
             AXIS2_FREE(env->allocator, temp_string1);
             temp_string1 = NULL;
@@ -351,17 +351,17 @@
         temp_string3 = AXIS2_STRACAT(temp_string2, "|", env);
         qname_impl->qname_string = AXIS2_STRACAT(temp_string3, qname_impl->prefix, env);
 
-        if (NULL != temp_string1)
+        if (temp_string1)
         {
             AXIS2_FREE(env->allocator, temp_string1);
             temp_string1 = NULL;
         }
-        if (NULL != temp_string2)
+        if (temp_string2)
         {
             AXIS2_FREE(env->allocator, temp_string2);
             temp_string2 = NULL;
         }
-        if (NULL != temp_string3)
+        if (temp_string3)
         {
             AXIS2_FREE(env->allocator, temp_string3);
             temp_string3 = NULL;
@@ -387,7 +387,7 @@
     temp_string = AXIS2_STRDUP(qstring, env);
 
     index = strchr(temp_string, '|');
-    if (index != NULL)
+    if (index)
     {
 
         next = index + 1;
@@ -396,7 +396,7 @@
         localpart = temp_string;
 
         index = strchr(next, '|');
-        if (NULL != index)
+        if (index)
         {
             prefix = index + 1;
             next[index - next] = '\0';
@@ -415,7 +415,7 @@
         /** only localpart is there in this qname */
         qn = axis2_qname_create(env, temp_string, NULL, NULL);
     }
-    if (NULL != temp_string)
+    if (temp_string)
     {
         AXIS2_FREE(env->allocator, temp_string);
         temp_string = NULL;

Modified: webservices/axis2/trunk/c/util/src/stack.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stack.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/stack.c (original)
+++ webservices/axis2/trunk/c/util/src/stack.c Mon Sep 18 18:39:03 2006
@@ -139,12 +139,12 @@
 
     stack_impl = AXIS2_INTF_TO_IMPL(stack);
 
-    if (NULL != stack_impl->data)
+    if (stack_impl->data)
     {
         AXIS2_FREE(env->allocator, stack_impl->data);
         stack_impl->data = NULL;
     }
-    if (NULL != stack->ops)
+    if (stack->ops)
     {
         AXIS2_FREE(env->allocator, stack->ops);
         stack->ops = NULL;

Modified: webservices/axis2/trunk/c/util/src/stream.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/stream.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/stream.c (original)
+++ webservices/axis2/trunk/c/util/src/stream.c Mon Sep 18 18:39:03 2006
@@ -136,7 +136,7 @@
     {
         case AXIS2_STREAM_BASIC:
         {
-            if (NULL != stream_impl->buffer)
+            if (stream_impl->buffer)
             {
                 AXIS2_FREE(env->allocator, stream_impl->buffer);
             }
@@ -152,7 +152,7 @@
         }
         case AXIS2_STREAM_SOCKET:
         {
-            if (NULL != stream_impl->fp)
+            if (stream_impl->fp)
             {
                 fclose(stream_impl->fp);
             }
@@ -164,7 +164,7 @@
             break;
     }
 
-    if (NULL != stream_impl->stream.ops)
+    if (stream_impl->stream.ops)
     {
         AXIS2_FREE(env->allocator, stream_impl->stream.ops);
     }

Modified: webservices/axis2/trunk/c/util/src/string.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/string.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/string.c (original)
+++ webservices/axis2/trunk/c/util/src/string.c Mon Sep 18 18:39:03 2006
@@ -99,7 +99,7 @@
     AXIS2_PARAM_CHECK(env->error, ptr, NULL);
 
     end = axis2_memchr(ptr, '\0', n);
-    if (NULL != end)
+    if (end)
         n = end - (axis2_char_t *) ptr;
     str = (axis2_char_t *) AXIS2_MALLOC(env->allocator,
             sizeof(axis2_char_t) * (n + 1));
@@ -130,7 +130,7 @@
 
     va_start(adummy, env);
 
-    while ((cp = va_arg(adummy, axis2_char_t *)) != NULL)
+    while ((cp = va_arg(adummy, axis2_char_t *)))
     {
         size_t cplen = strlen(cp);
         if (nargs < MAX_SAVED_LENGTHS)
@@ -157,7 +157,7 @@
     va_start(adummy, env);
 
     nargs = 0;
-    while ((argp = va_arg(adummy, axis2_char_t *)) != NULL)
+    while ((argp = va_arg(adummy, axis2_char_t *)))
     {
         if (nargs < MAX_SAVED_LENGTHS)
         {
@@ -296,7 +296,7 @@
     newstr = AXIS2_STRDUP(str, env);
 
     index = strchr(newstr, s1);
-    while (NULL != index)
+    while (index)
     {
         newstr[index - newstr] = s2;
         index = strchr(newstr, s1);

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?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/string_util.c (original)
+++ webservices/axis2/trunk/c/util/src/string_util.c Mon Sep 18 18:39:03 2006
@@ -40,7 +40,7 @@
     do
     {
         index = strchr(str, delim);
-        if ((index == NULL) && (NULL != str) && AXIS2_STRCMP(str, "") != 0)
+        if ((index == NULL) && (str) && AXIS2_STRCMP(str, "") != 0)
         {
             AXIS2_ARRAY_LIST_ADD(list, env, str);
             break;
@@ -48,7 +48,7 @@
 
         rest = index + 1;
         str[index - str] = '\0';
-        if ((NULL != list) && (NULL != str) && AXIS2_STRCMP(str, "") != 0)
+        if ((list) && (NULL != str) && AXIS2_STRCMP(str, "") != 0)
         {
 
             AXIS2_ARRAY_LIST_ADD(list, env, str);

Modified: webservices/axis2/trunk/c/util/src/thread_pool.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/thread_pool.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/thread_pool.c (original)
+++ webservices/axis2/trunk/c/util/src/thread_pool.c Mon Sep 18 18:39:03 2006
@@ -96,7 +96,7 @@
         return AXIS2_FAILURE;
     }
     pool_impl = AXIS2_INTF_TO_IMPL(pool);
-    if (NULL != pool_impl->thread_pool.ops)
+    if (pool_impl->thread_pool.ops)
     {
         AXIS2_FREE(pool_impl->allocator, pool_impl->thread_pool.ops);
     }

Modified: webservices/axis2/trunk/c/util/src/uri.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/uri.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/uri.c (original)
+++ webservices/axis2/trunk/c/util/src/uri.c Mon Sep 18 18:39:03 2006
@@ -167,7 +167,7 @@
     /** structure returned from gethostbyname() */
     struct hostent *hostent;
 
-    /** The port number, numeric, valid only if port_str != NULL */
+    /** The port number, numeric, valid only if port_str  */
     axis2_port_t port;
 
     /** has the structure been initialized */
@@ -281,61 +281,61 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     uri_impl = AXIS2_INTF_TO_IMPL(uri);
 
-    if (NULL != uri_impl->scheme)
+    if (uri_impl->scheme)
     {
         AXIS2_FREE(env->allocator, uri_impl->scheme);
         uri_impl->scheme = NULL;
     }
 
-    if (NULL != uri_impl->hostinfo)
+    if (uri_impl->hostinfo)
     {
         AXIS2_FREE(env->allocator, uri_impl->hostinfo);
         uri_impl->hostinfo = NULL;
     }
 
-    if (NULL != uri_impl->user)
+    if (uri_impl->user)
     {
         AXIS2_FREE(env->allocator, uri_impl->user);
         uri_impl->user = NULL;
     }
 
-    if (NULL != uri_impl->password)
+    if (uri_impl->password)
     {
         AXIS2_FREE(env->allocator, uri_impl->password);
         uri_impl->password = NULL;
     }
 
-    if (NULL != uri_impl->hostname)
+    if (uri_impl->hostname)
     {
         AXIS2_FREE(env->allocator, uri_impl->hostname);
         uri_impl->hostname = NULL;
     }
 
-    if (NULL != uri_impl->port_str)
+    if (uri_impl->port_str)
     {
         AXIS2_FREE(env->allocator, uri_impl->port_str);
         uri_impl->port_str = NULL;
     }
 
-    if (NULL != uri_impl->path)
+    if (uri_impl->path)
     {
         AXIS2_FREE(env->allocator, uri_impl->path);
         uri_impl->path = NULL;
     }
 
-    if (NULL != uri_impl->query)
+    if (uri_impl->query)
     {
         AXIS2_FREE(env->allocator, uri_impl->query);
         uri_impl->query = NULL;
     }
 
-    if (NULL != uri_impl->fragment)
+    if (uri_impl->fragment)
     {
         AXIS2_FREE(env->allocator, uri_impl->fragment);
         uri_impl->fragment = NULL;
     }
 
-    if (NULL != uri->ops)
+    if (uri->ops)
         AXIS2_FREE(env->allocator, uri->ops);
 
     AXIS2_FREE(env->allocator, uri_impl);
@@ -741,7 +741,7 @@
 
     if (scheme_str)
     {
-        for (scheme = schemes; scheme->name != NULL; ++scheme)
+        for (scheme = schemes; scheme->name ; ++scheme)
         {
             if (AXIS2_STRCASECMP(scheme_str, scheme->name) == 0)
             {

Modified: webservices/axis2/trunk/c/util/src/url.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/url.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/url.c (original)
+++ webservices/axis2/trunk/c/util/src/url.c Mon Sep 18 18:39:03 2006
@@ -109,13 +109,13 @@
     url_impl->path = NULL;
     url_impl->port = port;
 
-    if (NULL != server)
+    if (server)
     {
         url_impl->server = (axis2_char_t *)AXIS2_STRDUP(server, env);
     }
     /** if the path is not starting with / we have to make it so
      */
-    if (NULL != path)
+    if (path)
     {
         if (path[0] == '/')
         {
@@ -232,7 +232,7 @@
         {
             /* No path - assume def path ('/') */
             params = strchr(server, '?');
-            if (NULL != params)
+            if (params)
             {
                 *params = '\0';
             }
@@ -245,7 +245,7 @@
         {
             *path++ = '\0';
             params = strchr(path, '?');
-            if (NULL != params)
+            if (params)
             {
                 *params = '\0';
             }
@@ -262,7 +262,7 @@
         if (NULL == path)
         {
             params = strchr(port_str, '?');
-            if (NULL != params)
+            if (params)
             {
                 *params = '\0';
             }
@@ -277,7 +277,7 @@
             *path++ = '\0';
             port = AXIS2_ATOI(port_str);
             params = strchr(path, '?');
-            if (NULL != params)
+            if (params)
             {
                 *params = '\0';
             }
@@ -305,23 +305,23 @@
     axis2_url_impl_t *url_impl = NULL;
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     url_impl = AXIS2_INTF_TO_IMPL(url);
-    if (NULL != url_impl->protocol)
+    if (url_impl->protocol)
     {
         AXIS2_FREE(env->allocator, url_impl->protocol);
         url_impl->protocol = NULL;
     }
-    if (NULL != url_impl->server)
+    if (url_impl->server)
     {
         AXIS2_FREE(env->allocator, url_impl->server);
         url_impl->server = NULL;
     }
-    if (NULL != url_impl->path)
+    if (url_impl->path)
     {
         AXIS2_FREE(env->allocator, url_impl->path);
         url_impl->path = NULL;
     }
     url_impl->port = -1;
-    if (NULL != url->ops)
+    if (url->ops)
         AXIS2_FREE(env->allocator, url->ops);
 
     AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(url));
@@ -358,7 +358,7 @@
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, protocol, AXIS2_FAILURE);
-    if (NULL != AXIS2_INTF_TO_IMPL(url)->protocol)
+    if (AXIS2_INTF_TO_IMPL(url)->protocol)
     {
         AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(url)->protocol);
         AXIS2_INTF_TO_IMPL(url)->protocol = NULL;
@@ -381,7 +381,7 @@
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, server, AXIS2_FAILURE);
-    if (NULL != AXIS2_INTF_TO_IMPL(url)->server)
+    if (AXIS2_INTF_TO_IMPL(url)->server)
     {
         AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(url)->server);
         AXIS2_INTF_TO_IMPL(url)->server = NULL;
@@ -421,7 +421,7 @@
 {
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     AXIS2_PARAM_CHECK(env->error, path, AXIS2_FAILURE);
-    if (NULL != AXIS2_INTF_TO_IMPL(url)->path)
+    if (AXIS2_INTF_TO_IMPL(url)->path)
     {
         AXIS2_FREE(env->allocator, AXIS2_INTF_TO_IMPL(url)->path);
         AXIS2_INTF_TO_IMPL(url)->path = NULL;

Modified: webservices/axis2/trunk/c/util/src/utils.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/utils.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/src/utils.c (original)
+++ webservices/axis2/trunk/c/util/src/utils.c Mon Sep 18 18:39:03 2006
@@ -47,14 +47,14 @@
             tmp += AXIS2_STRLEN(AXIS2_REQUEST_URL_PREFIX);
         }
     }
-    if (NULL != service_str)
+    if (service_str)
     {
         service_str += AXIS2_STRLEN(AXIS2_REQUEST_URL_PREFIX);
         if ('\0' != *service_str)
         {
             service_str++; /*to remove the leading '/' */
             tmp = strchr(service_str, '/');
-            if (NULL != tmp)
+            if (tmp)
             {
                 i = tmp - service_str;
                 ret[0] = AXIS2_MALLOC(env->allocator, i * sizeof(char) + 1);
@@ -67,7 +67,7 @@
                 {
                     service_str++;
                     tmp = strchr(service_str, '?');
-                    if (NULL != tmp)
+                    if (tmp)
                     {
                         i = tmp - service_str;
                         ret[1] = AXIS2_MALLOC(env->allocator,

Modified: webservices/axis2/trunk/c/util/test/unit/util/util_hash_test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/unit/util/util_hash_test.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/test/unit/util/util_hash_test.c (original)
+++ webservices/axis2/trunk/c/util/test/unit/util/util_hash_test.c Mon Sep 18 18:39:03 2006
@@ -119,7 +119,7 @@
         index_i = axis2_hash_next(environment, index_i);
 
     }
-    while (NULL != index_i);
+    while (index_i);
 
     printf("actual:%s\n",  actual->value);
     CuAssertStrEquals(tc, expected->value, actual->value);

Modified: webservices/axis2/trunk/c/util/test/util/test_thread.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/test/util/test_thread.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/util/test/util/test_thread.c (original)
+++ webservices/axis2/trunk/c/util/test/util/test_thread.c Mon Sep 18 18:39:03 2006
@@ -52,12 +52,12 @@
 
     control = axis2_thread_once_init(allocator);
 
-    if (NULL != control) printf("success - thread_init - axis2_thread_once_init \n");
+    if (control) printf("success - thread_init - axis2_thread_once_init \n");
     else printf("failure - thread_init - axis2_thread_once_init \n");
 
     thread_lock = axis2_thread_mutex_create(allocator, AXIS2_THREAD_MUTEX_DEFAULT);
 
-    if (NULL != thread_lock) printf("success - thread_init - axis2_thread_mutex_create \n");
+    if (thread_lock) printf("success - thread_init - axis2_thread_mutex_create \n");
     else printf("failure - thread_init - axis2_thread_mutex_create \n");
 }
 

Modified: webservices/axis2/trunk/c/woden/src/builder/reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/reader.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/reader.c Mon Sep 18 18:39:03 2006
@@ -653,7 +653,7 @@
         wsdl_modules = axis2_hash_make(env);
     }
     ext_reg = woden_reader_get_ext_registry(reader, env);
-    if (NULL != ext_reg)
+    if (ext_reg)
     {
         WODEN_DESC_ELEMENT_SET_EXT_REGISTRY(desc, env, ext_reg);
     }
@@ -667,7 +667,7 @@
     target_namespc = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(desc_el,
             env, WODEN_ATTR_TARGET_NAMESPACE);
 
-    if (NULL != target_namespc)
+    if (target_namespc)
     {
         axis2_uri_t *target_namespc_uri = NULL;
 
@@ -722,7 +722,7 @@
     temp_el = axiom_util_get_first_child_element(desc_el, env, desc_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_import = NULL;
@@ -755,7 +755,7 @@
         {
             void *import_element = NULL;
 
-            if (NULL != document_base_uri && AXIS2_TRUE !=
+            if (document_base_uri && AXIS2_TRUE !=
                     axis2_hash_contains_key(wsdl_modules, env,
                             document_base_uri))
             {
@@ -772,7 +772,7 @@
         {
             void *include_element = NULL;
 
-            if (NULL != document_base_uri && AXIS2_TRUE !=
+            if (document_base_uri && AXIS2_TRUE !=
                     axis2_hash_contains_key(wsdl_modules, env,
                             document_base_uri))
             {
@@ -903,7 +903,7 @@
     temp_el = axiom_util_get_first_child_element(doc_el, env, doc_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el)
+    while (temp_el)
     {
         void *ext_el = NULL;
 
@@ -947,7 +947,7 @@
     if (AXIS2_SUCCESS != status)
         return NULL;
 
-    if (NULL != namespc_uri)
+    if (namespc_uri)
     {
         axis2_uri_t *uri = NULL;
 
@@ -957,7 +957,7 @@
         AXIS2_URI_FREE(uri, env);
     }
 
-    if (NULL != location_uri)
+    if (location_uri)
     {
         axis2_uri_t *uri = NULL;
         void *imported_desc = NULL;
@@ -1001,7 +1001,7 @@
     if (AXIS2_SUCCESS != status)
         return NULL;
 
-    if (NULL != location_uri)
+    if (location_uri)
     {
         axis2_uri_t *uri = NULL;
         void *included_desc = NULL;
@@ -1053,7 +1053,7 @@
     temp_el = axiom_util_get_first_child_element(types_el, env, types_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_temp_el_type = NULL;
@@ -1135,7 +1135,7 @@
     tns = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(schema_el, env,
             WODEN_ATTR_TARGET_NAMESPACE);
 
-    if (NULL != tns)
+    if (tns)
     {
         void *base = WODEN_INLINED_SCHEMA_GET_BASE_IMPL(schema, env);
         axis2_uri_t *uri = get_uri(env, tns);
@@ -1218,7 +1218,7 @@
     import_el = AXIOM_NODE_GET_DATA_ELEMENT(import_el_node, env);
     ns = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(import_el, env,
             WODEN_ATTR_NAMESPACE);
-    if (NULL != ns)
+    if (ns)
     {
         uri = get_uri(env, ns);
         schema = woden_imported_schema_to_schema(schema, env);
@@ -1228,7 +1228,7 @@
     }
     sloc = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(import_el, env,
             WODEN_ATTR_SCHEMA_LOCATION);
-    if (NULL != sloc)
+    if (sloc)
     {
         uri = get_uri(env, sloc);
         WODEN_IMPORTED_SCHEMA_SET_LOCATION(schema, env, uri);
@@ -1274,7 +1274,7 @@
     /* If the schema has already been imported, reuse it. */
     schema_def = axis2_hash_get(reader_impl->f_imported_schemas, schema_uri,
             AXIS2_HASH_KEY_STRING);
-    if (NULL != schema_def)
+    if (schema_def)
     {
         /* Not previously imported, so retrieve it now. */
         xml_schema_collection_t *schema_col = NULL;
@@ -1301,7 +1301,7 @@
 
     }
 
-    if (NULL != schema_def)
+    if (schema_def)
     {
         WODEN_SCHEMA_SET_SCHEMA_DEF(schema, env, schema_def);
     }
@@ -1350,7 +1350,7 @@
      *
      */
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -1366,7 +1366,7 @@
     style_default = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(interface_el,
             env, WODEN_ATTR_STYLE_DEFAULT);
 
-    if (NULL != style_default)
+    if (style_default)
     {
         axis2_array_list_t *string_list = NULL;
         axis2_char_t *uri_str = NULL;
@@ -1403,7 +1403,7 @@
     temp_el = axiom_util_get_first_child_element(interface_el, env, interface_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_fault = NULL;
@@ -1521,7 +1521,7 @@
     fault_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_el, env, WODEN_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *ns = NULL;
@@ -1538,7 +1538,7 @@
 
     element = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_el, env, WODEN_ATTR_ELEMENT);
 
-    if (NULL != element)
+    if (element)
     {
         axis2_qname_t *qname = NULL;
         axis2_hash_t *namespcs = NULL;
@@ -1562,7 +1562,7 @@
     temp_el = axiom_util_get_first_child_element(fault_el, env, fault_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -1647,7 +1647,7 @@
     op_el = AXIOM_NODE_GET_DATA_ELEMENT(op_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *ns = NULL;
@@ -1662,7 +1662,7 @@
 
     style = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_ATTR_STYLE);
 
-    if (NULL != style)
+    if (style)
     {
         axis2_array_list_t *str_list = NULL;
         axis2_char_t *uri_str = NULL;
@@ -1683,7 +1683,7 @@
 
     pat = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_ATTR_PATTERN);
 
-    if (NULL != pat)
+    if (pat)
     {
         axis2_uri_t *uri = NULL;
 
@@ -1707,7 +1707,7 @@
     temp_el = axiom_util_get_first_child_element(op_el, env, op_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -1861,7 +1861,7 @@
     attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_REF);
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_ATTR_REF);
 
-    if (NULL != ref)
+    if (ref)
     {
         axis2_qname_t *qname = NULL;
         axis2_hash_t *namespcs = NULL;
@@ -1879,7 +1879,7 @@
     msg_label_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env,
             WODEN_ATTR_MESSAGE_LABEL);
 
-    if (NULL != msg_label_str)
+    if (msg_label_str)
     {
         woden_msg_label_t *msg_label_in = NULL;
         woden_msg_label_t *msg_label_out = NULL;
@@ -1929,7 +1929,7 @@
     temp_el = axiom_util_get_first_child_element(fault_ref_el, env, fault_ref_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -2040,7 +2040,7 @@
     msg_label_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env,
             WODEN_ATTR_MESSAGE_LABEL);
 
-    if (NULL != msg_label_str)
+    if (msg_label_str)
     {
         woden_msg_label_t *msg_label_in = NULL;
         woden_msg_label_t *msg_label_out = NULL;
@@ -2115,7 +2115,7 @@
 
     element = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env, WODEN_ATTR_ELEMENT);
 
-    if (NULL != element)
+    if (element)
     {
         if (0 == AXIS2_STRCMP(element, WODEN_NMTOKEN_ANY) ||
                 0 == AXIS2_STRCMP(element, WODEN_NMTOKEN_NONE) ||
@@ -2170,7 +2170,7 @@
     temp_el = axiom_util_get_first_child_element(msg_ref_el, env, msg_ref_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -2253,7 +2253,7 @@
     binding_el = AXIOM_NODE_GET_DATA_ELEMENT(binding_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -2267,7 +2267,7 @@
     }
 
     intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_ATTR_INTERFACE);
-    if (NULL != intface)
+    if (intface)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -2278,7 +2278,7 @@
         WODEN_BINDING_ELEMENT_SET_INTERFACE_QNAME(binding, env, intface_qn);
     }
     /* Dereference the interface qname */
-    if (NULL != intface_qn)
+    if (intface_qn)
     {
         axis2_array_list_t *interfaces = NULL;
         int i = 0, size = 0;
@@ -2303,7 +2303,7 @@
 
     type = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_ATTR_TYPE);
 
-    if (NULL != type)
+    if (type)
     {
         axis2_uri_t *uri = NULL;
 
@@ -2333,7 +2333,7 @@
     temp_el = axiom_util_get_first_child_element(binding_el, env, binding_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_fault = NULL;
@@ -2448,7 +2448,7 @@
     fault_el = AXIOM_NODE_GET_DATA_ELEMENT(fault_el_node, env);
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_el, env, WODEN_ATTR_REF);
 
-    if (NULL != ref)
+    if (ref)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -2459,14 +2459,14 @@
         WODEN_BINDING_FAULT_ELEMENT_SET_REF(fault, env, int_flt_qn);
     }
     /* Dereference the interface fault qname */
-    if (NULL != int_flt_qn)
+    if (int_flt_qn)
     {
         void *intface = NULL;
 
         /* Here I know that parent is an instance of binding */
         parent = woden_binding_to_binding_element(parent, env);
         intface = WODEN_BINDING_ELEMENT_GET_INTERFACE_ELEMENT(parent, env);
-        if (NULL != intface)
+        if (intface)
         {
             axis2_array_list_t *int_faults = NULL;
             int i = 0, size = 0;
@@ -2507,7 +2507,7 @@
     temp_el = axiom_util_get_first_child_element(fault_el, env, fault_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -2593,7 +2593,7 @@
     op_el = AXIOM_NODE_GET_DATA_ELEMENT(op_el_node, env);
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_ATTR_REF);
 
-    if (NULL != ref)
+    if (ref)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -2604,7 +2604,7 @@
         WODEN_BINDING_OP_ELEMENT_SET_REF(op, env, ref_qn);
     }
     /* Dereference the 'ref' qname to an interface_op_element */
-    if (NULL != ref_qn)
+    if (ref_qn)
     {
         void *intface = NULL;
         axis2_array_list_t *int_ops = NULL;
@@ -2648,7 +2648,7 @@
     temp_el = axiom_util_get_first_child_element(op_el, env, op_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -2787,7 +2787,7 @@
     attr_ref = axis2_qname_create_from_string(env, WODEN_ATTR_REF);
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_ATTR_REF);
 
-    if (NULL != ref)
+    if (ref)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -2802,7 +2802,7 @@
     msg_label_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env,
             WODEN_ATTR_MESSAGE_LABEL);
 
-    if (NULL != msg_label_str)
+    if (msg_label_str)
     {
         woden_msg_label_t *msg_label_in = NULL;
         woden_msg_label_t *msg_label_out = NULL;
@@ -2852,7 +2852,7 @@
     msg_label_in = woden_msg_label_get_msg_label_in(env);
     msg_label_out = woden_msg_label_get_msg_label_out(env);
 
-    if (NULL != qref &&
+    if (qref &&
             (msg_label == msg_label_in ||
                     msg_label == msg_label_out))
     {
@@ -2862,7 +2862,7 @@
         bind_op = woden_binding_op_to_binding_op_element(bind_op, env);
         int_op = WODEN_BINDING_OP_ELEMENT_GET_INTERFACE_OP_ELEMENT(
                     bind_op, env);
-        if (NULL != int_op)
+        if (int_op)
         {
             axis2_array_list_t *int_flt_refs = NULL;
             int i = 0, size = 0;
@@ -2912,7 +2912,7 @@
     temp_el = axiom_util_get_first_child_element(fault_ref_el, env, fault_ref_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -3018,7 +3018,7 @@
     msg_label_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env,
             WODEN_ATTR_MESSAGE_LABEL);
 
-    if (NULL != msg_label_str)
+    if (msg_label_str)
     {
         woden_msg_label_t *msg_label_in = NULL;
         woden_msg_label_t *msg_label_out = NULL;
@@ -3112,7 +3112,7 @@
         bind_op = woden_binding_op_to_binding_op_element(bind_op, env);
         int_op = WODEN_BINDING_OP_ELEMENT_GET_INTERFACE_OP_ELEMENT(
                     bind_op, env);
-        if (NULL != int_op)
+        if (int_op)
         {
             axis2_array_list_t *int_msg_refs = NULL;
             int i = 0, size = 0;
@@ -3160,7 +3160,7 @@
     temp_el = axiom_util_get_first_child_element(msg_ref_el, env, msg_ref_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -3241,7 +3241,7 @@
     svc_el = AXIOM_NODE_GET_DATA_ELEMENT(svc_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(svc_el, env, WODEN_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -3255,7 +3255,7 @@
     }
 
     intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(svc_el, env, WODEN_ATTR_INTERFACE);
-    if (NULL != intface)
+    if (intface)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -3266,7 +3266,7 @@
         WODEN_SVC_ELEMENT_SET_INTERFACE_QNAME(svc, env, intface_qn);
     }
     /* Dereference the interface qname */
-    if (NULL != intface_qn)
+    if (intface_qn)
     {
         axis2_array_list_t *interfaces = NULL;
         int i = 0, size = 0;
@@ -3307,7 +3307,7 @@
     temp_el = axiom_util_get_first_child_element(svc_el, env, svc_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_endpoint = NULL;
@@ -3405,7 +3405,7 @@
     endpoint_el = AXIOM_NODE_GET_DATA_ELEMENT(endpoint_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         woden_nc_name_t *nc_name = woden_nc_name_create(env, name);
         endpoint = woden_endpoint_to_endpoint_element(endpoint, env);
@@ -3414,7 +3414,7 @@
 
     attr_binding = axis2_qname_create_from_string(env, WODEN_ATTR_BINDING);
     binding = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_ATTR_BINDING);
-    if (NULL != binding)
+    if (binding)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -3425,7 +3425,7 @@
         WODEN_ENDPOINT_ELEMENT_SET_BINDING_QNAME(endpoint, env, binding_qn);
     }
     /* Dereference the binding qname */
-    if (NULL != binding_qn)
+    if (binding_qn)
     {
         axis2_array_list_t *bindings = NULL;
         int i = 0, size = 0;
@@ -3453,7 +3453,7 @@
     endpoint_el = AXIOM_NODE_GET_DATA_ELEMENT(endpoint_el_node, env);
     address = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_ATTR_ADDRESS);
 
-    if (NULL != address)
+    if (address)
     {
         axis2_uri_t *address_uri = NULL;
 
@@ -3478,7 +3478,7 @@
     temp_el = axiom_util_get_first_child_element(endpoint_el, env, endpoint_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -3562,7 +3562,7 @@
     feature_el = AXIOM_NODE_GET_DATA_ELEMENT(feature_el_node, env);
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(feature_el, env, WODEN_ATTR_REF);
 
-    if (NULL != ref)
+    if (ref)
     {
         axis2_uri_t *ref_uri = get_uri(env, ref);
         feature = woden_feature_to_feature_element(feature, env);
@@ -3573,7 +3573,7 @@
     attr_req = axis2_qname_create_from_string(env, WODEN_ATTR_REQUIRED);
 
     req = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(feature_el, env, WODEN_ATTR_REQUIRED);
-    if (NULL != req && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, req))
+    if (req && 0 == AXIS2_STRCMP(WODEN_VALUE_TRUE, req))
         required = AXIS2_TRUE;
     else
         required = AXIS2_FALSE;
@@ -3598,7 +3598,7 @@
     temp_el = axiom_util_get_first_child_element(feature_el, env, feature_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
 
@@ -3683,7 +3683,7 @@
     property_el = AXIOM_NODE_GET_DATA_ELEMENT(property_el_node, env);
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(property_el, env, WODEN_ATTR_REF);
 
-    if (NULL != ref)
+    if (ref)
     {
         axis2_uri_t *ref_uri = get_uri(env, ref);
         property = woden_property_to_property_element(property, env);
@@ -3700,7 +3700,7 @@
     temp_el = axiom_util_get_first_child_element(property_el, env, property_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_value = NULL;
@@ -3746,7 +3746,7 @@
              * and don't check for extraneous text or child elements?
              */
             node = AXIOM_NODE_GET_FIRST_CHILD(temp_el_node, env);
-            if (NULL != node && AXIOM_TEXT == AXIOM_NODE_GET_NODE_TYPE(
+            if (node && AXIOM_TEXT == AXIOM_NODE_GET_NODE_TYPE(
                         node, env))
             {
                 axis2_char_t *temp_str = NULL;
@@ -3841,7 +3841,7 @@
         }
         if (!prefix) prefix = "";
         attr_type = axis2_qname_create(env, localname, namespc_uri_str, prefix);
-        if (NULL != namespc_uri_str && 0 != AXIS2_STRCMP(namespc_uri_str,
+        if (namespc_uri_str && 0 != AXIS2_STRCMP(namespc_uri_str,
                 WODEN_NS_URI_WSDL20))
         {
             if (0 != AXIS2_STRCMP(namespc_uri_str, WODEN_NS_URI_XMLNS) &&
@@ -3852,11 +3852,11 @@
 
                 desc = woden_desc_to_desc_element(desc, env);
                 ext_reg = WODEN_DESC_ELEMENT_GET_EXT_REGISTRY(desc, env);
-                if (NULL != ext_reg)
+                if (ext_reg)
                 {
                     xml_attr = WODEN_EXT_REGISTRY_QUERY_EXT_ATTR_TYPE(
                                 ext_reg, env, wsdl_class, attr_type);
-                    if (NULL != xml_attr)
+                    if (xml_attr)
                     {
                         axis2_char_t *attr_value = NULL;
 

Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/wsdl10_reader.c Mon Sep 18 18:39:03 2006
@@ -646,7 +646,7 @@
         wsdl_modules = axis2_hash_make(env);
     }
     ext_reg = woden_wsdl10_reader_get_ext_registry(reader, env);
-    if (NULL != ext_reg)
+    if (ext_reg)
     {
         WODEN_WSDL10_DESC_ELEMENT_SET_EXT_REGISTRY(desc, env, ext_reg);
     }
@@ -660,7 +660,7 @@
     target_namespc = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(desc_el,
             env, WODEN_WSDL10_ATTR_TARGET_NAMESPACE);
 
-    if (NULL != target_namespc)
+    if (target_namespc)
     {
         axis2_uri_t *target_namespc_uri = NULL;
 
@@ -718,7 +718,7 @@
     temp_el = axiom_util_get_first_child_element(desc_el, env, desc_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_import = NULL;
@@ -753,7 +753,7 @@
         {
             void *import_element = NULL;
 
-            if (NULL != document_base_uri && AXIS2_TRUE !=
+            if (document_base_uri && AXIS2_TRUE !=
                     axis2_hash_contains_key(wsdl_modules, env,
                             document_base_uri))
             {
@@ -770,7 +770,7 @@
         {
             void *include_element = NULL;
 
-            if (NULL != document_base_uri && AXIS2_TRUE !=
+            if (document_base_uri && AXIS2_TRUE !=
                     axis2_hash_contains_key(wsdl_modules, env,
                             document_base_uri))
             {
@@ -919,7 +919,7 @@
     temp_el = axiom_util_get_first_child_element(doc_el, env, doc_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el)
+    while (temp_el)
     {
         void *ext_el = NULL;
         void *wsdl_el = NULL;
@@ -965,7 +965,7 @@
     if (AXIS2_SUCCESS != status)
         return NULL;
 
-    if (NULL != namespc_uri)
+    if (namespc_uri)
     {
         axis2_uri_t *uri = NULL;
 
@@ -975,7 +975,7 @@
         AXIS2_URI_FREE(uri, env);
     }
 
-    if (NULL != location_uri)
+    if (location_uri)
     {
         axis2_uri_t *uri = NULL;
         void *imported_desc = NULL;
@@ -1019,7 +1019,7 @@
     if (AXIS2_SUCCESS != status)
         return NULL;
 
-    if (NULL != location_uri)
+    if (location_uri)
     {
         axis2_uri_t *uri = NULL;
         void *included_desc = NULL;
@@ -1071,7 +1071,7 @@
     temp_el = axiom_util_get_first_child_element(types_el, env, types_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_temp_el_type = NULL;
@@ -1161,7 +1161,7 @@
     tns = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(schema_el, env,
             WODEN_WSDL10_ATTR_TARGET_NAMESPACE);
 
-    if (NULL != tns)
+    if (tns)
     {
         void *base = WODEN_INLINED_SCHEMA_GET_BASE_IMPL(schema, env);
         axis2_uri_t *uri = get_uri(env, tns);
@@ -1246,7 +1246,7 @@
     import_el = AXIOM_NODE_GET_DATA_ELEMENT(import_el_node, env);
     ns = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(import_el, env,
             WODEN_WSDL10_ATTR_NAMESPACE);
-    if (NULL != ns)
+    if (ns)
     {
         uri = get_uri(env, ns);
         WODEN_SCHEMA_SET_NAMESPACE(base_schema, env, uri);
@@ -1255,7 +1255,7 @@
     }
     sloc = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(import_el, env,
             WODEN_ATTR_SCHEMA_LOCATION);
-    if (NULL != sloc)
+    if (sloc)
     {
         uri = get_uri(env, sloc);
         WODEN_IMPORTED_SCHEMA_SET_LOCATION(schema, env, uri);
@@ -1305,7 +1305,7 @@
     /* If the schema has already been imported, reuse it. */
     schema_def = axis2_hash_get(reader_impl->f_imported_schemas, schema_uri,
             AXIS2_HASH_KEY_STRING);
-    if (NULL != schema_def)
+    if (schema_def)
     {
         /* Not previously imported, so retrieve it now. */
         xml_schema_collection_t *schema_col = NULL;
@@ -1335,7 +1335,7 @@
 
     }
 
-    if (NULL != schema_def)
+    if (schema_def)
     {
         void *base_schema = NULL;
 
@@ -1373,7 +1373,7 @@
     msg_el = AXIOM_NODE_GET_DATA_ELEMENT(msg_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_el, env, WODEN_WSDL10_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -1403,7 +1403,7 @@
     temp_el = axiom_util_get_first_child_element(msg_el, env, msg_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_part = NULL;
@@ -1497,7 +1497,7 @@
     }
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(part_el, env, WODEN_WSDL10_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -1511,7 +1511,7 @@
     }
     element = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(part_el, env, WODEN_WSDL10_ATTR_ELEMENT);
 
-    if (NULL != element)
+    if (element)
     {
         axis2_qname_t *qname = NULL;
         axis2_hash_t *namespcs = NULL;
@@ -1534,7 +1534,7 @@
     temp_el = axiom_util_get_first_child_element(part_el, env, part_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
 
@@ -1599,7 +1599,7 @@
     interface_el = AXIOM_NODE_GET_DATA_ELEMENT(interface_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(interface_el, env, WODEN_WSDL10_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -1615,7 +1615,7 @@
     style_default = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(interface_el,
             env, WODEN_WSDL10_ATTR_STYLE_DEFAULT);
 
-    if (NULL != style_default)
+    if (style_default)
     {
         axis2_array_list_t *string_list = NULL;
         axis2_char_t *uri_str = NULL;
@@ -1652,7 +1652,7 @@
     temp_el = axiom_util_get_first_child_element(interface_el, env, interface_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_op = NULL;
@@ -1759,7 +1759,7 @@
     op_el = AXIOM_NODE_GET_DATA_ELEMENT(op_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_WSDL10_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *ns = NULL;
@@ -1774,7 +1774,7 @@
 
     style = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_WSDL10_ATTR_STYLE);
 
-    if (NULL != style)
+    if (style)
     {
         axis2_array_list_t *str_list = NULL;
         axis2_char_t *uri_str = NULL;
@@ -1795,7 +1795,7 @@
 
     pat = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_WSDL10_ATTR_PATTERN);
 
-    if (NULL != pat)
+    if (pat)
     {
         axis2_uri_t *uri = NULL;
 
@@ -1819,7 +1819,7 @@
     temp_el = axiom_util_get_first_child_element(op_el, env, op_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -1981,7 +1981,7 @@
     }
 
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_WSDL10_ATTR_NAME);
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -1997,7 +1997,7 @@
     }
 
     msg = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_WSDL10_ATTR_MSG);
-    if (NULL != msg)
+    if (msg)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -2021,7 +2021,7 @@
     temp_el = axiom_util_get_first_child_element(fault_ref_el, env, fault_ref_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
 
@@ -2113,7 +2113,7 @@
     }
 
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env, WODEN_WSDL10_ATTR_NAME);
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -2128,7 +2128,7 @@
     }
 
     msg = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env, WODEN_WSDL10_ATTR_MSG);
-    if (NULL != msg)
+    if (msg)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -2168,7 +2168,7 @@
     temp_el = axiom_util_get_first_child_element(msg_ref_el, env, msg_ref_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
 
@@ -2238,7 +2238,7 @@
     binding_el = AXIOM_NODE_GET_DATA_ELEMENT(binding_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_WSDL10_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -2252,7 +2252,7 @@
     }
 
     intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_WSDL10_ATTR_INTERFACE);
-    if (NULL != intface)
+    if (intface)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -2263,7 +2263,7 @@
         WODEN_BINDING_ELEMENT_SET_INTERFACE_QNAME(binding, env, intface_qn);
     }
     /* Dereference the interface qname */
-    if (NULL != intface_qn)
+    if (intface_qn)
     {
         axis2_array_list_t *interfaces = NULL;
         int i = 0, size = 0;
@@ -2288,7 +2288,7 @@
 
     type = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(binding_el, env, WODEN_WSDL10_ATTR_TYPE);
 
-    if (NULL != type)
+    if (type)
     {
         axis2_uri_t *uri = NULL;
 
@@ -2317,7 +2317,7 @@
     temp_el = axiom_util_get_first_child_element(binding_el, env, binding_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_op = NULL;
@@ -2419,7 +2419,7 @@
     op_el = AXIOM_NODE_GET_DATA_ELEMENT(op_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(op_el, env, WODEN_WSDL10_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_uri_t *namespc = NULL;
         axis2_char_t *namespc_str = NULL;
@@ -2431,7 +2431,7 @@
         WODEN_WSDL10_BINDING_OP_ELEMENT_SET_QNAME(op, env, ref_qn);
     }
     /* Dereference the 'ref' qname to an interface_op_element */
-    if (NULL != ref_qn)
+    if (ref_qn)
     {
         void *intface = NULL;
         axis2_array_list_t *int_ops = NULL;
@@ -2475,7 +2475,7 @@
     temp_el = axiom_util_get_first_child_element(op_el, env, op_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -2615,7 +2615,7 @@
     attr_ref = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REF);
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env, WODEN_WSDL10_ATTR_REF);
 
-    if (NULL != ref)
+    if (ref)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -2630,7 +2630,7 @@
     msg_label_str = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(fault_ref_el, env,
             WODEN_WSDL10_ATTR_MESSAGE_LABEL);
 
-    if (NULL != msg_label_str)
+    if (msg_label_str)
     {
         woden_msg_label_t *msg_label_in = NULL;
         woden_msg_label_t *msg_label_out = NULL;
@@ -2680,7 +2680,7 @@
     msg_label_in = woden_msg_label_get_msg_label_in(env);
     msg_label_out = woden_msg_label_get_msg_label_out(env);
 
-    if (NULL != qref &&
+    if (qref &&
             (msg_label == msg_label_in ||
                     msg_label == msg_label_out))
     {
@@ -2690,7 +2690,7 @@
         bind_op = woden_wsdl10_binding_op_to_binding_op_element(bind_op, env);
         int_op = WODEN_WSDL10_BINDING_OP_ELEMENT_GET_INTERFACE_OP_ELEMENT(
                     bind_op, env);
-        if (NULL != int_op)
+        if (int_op)
         {
             axis2_array_list_t *int_flt_refs = NULL;
             int i = 0, size = 0;
@@ -2741,7 +2741,7 @@
     temp_el = axiom_util_get_first_child_element(fault_ref_el, env, fault_ref_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -2857,7 +2857,7 @@
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(msg_ref_el, env,
             WODEN_WSDL10_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -2880,7 +2880,7 @@
     bind_op = woden_wsdl10_binding_op_to_binding_op_element(bind_op, env);
     int_op = WODEN_WSDL10_BINDING_OP_ELEMENT_GET_INTERFACE_OP_ELEMENT(
                 bind_op, env);
-    if (NULL != int_op)
+    if (int_op)
     {
         axis2_array_list_t *int_msg_refs = NULL;
         int i = 0, size = 0;
@@ -2927,7 +2927,7 @@
     temp_el = axiom_util_get_first_child_element(msg_ref_el, env, msg_ref_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -3019,7 +3019,7 @@
     svc_el = AXIOM_NODE_GET_DATA_ELEMENT(svc_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(svc_el, env, WODEN_WSDL10_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         axis2_qname_t *qname = NULL;
         axis2_uri_t *namespc = NULL;
@@ -3033,7 +3033,7 @@
     }
 
     intface = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(svc_el, env, WODEN_WSDL10_ATTR_INTERFACE);
-    if (NULL != intface)
+    if (intface)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -3044,7 +3044,7 @@
         WODEN_WSDL10_SVC_ELEMENT_SET_INTERFACE_QNAME(svc, env, intface_qn);
     }
     /* Dereference the interface qname */
-    if (NULL != intface_qn)
+    if (intface_qn)
     {
         axis2_array_list_t *interfaces = NULL;
         int i = 0, size = 0;
@@ -3085,7 +3085,7 @@
     temp_el = axiom_util_get_first_child_element(svc_el, env, svc_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_endpoint = NULL;
@@ -3192,7 +3192,7 @@
     endpoint_el = AXIOM_NODE_GET_DATA_ELEMENT(endpoint_el_node, env);
     name = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_WSDL10_ATTR_NAME);
 
-    if (NULL != name)
+    if (name)
     {
         woden_nc_name_t *nc_name = woden_nc_name_create(env, name);
         endpoint = woden_wsdl10_endpoint_to_endpoint_element(endpoint, env);
@@ -3201,7 +3201,7 @@
 
     attr_binding = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_BINDING);
     binding = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_WSDL10_ATTR_BINDING);
-    if (NULL != binding)
+    if (binding)
     {
         axis2_hash_t *namespcs = NULL;
 
@@ -3212,7 +3212,7 @@
         WODEN_WSDL10_ENDPOINT_ELEMENT_SET_BINDING_QNAME(endpoint, env, binding_qn);
     }
     /* Dereference the binding qname */
-    if (NULL != binding_qn)
+    if (binding_qn)
     {
         axis2_array_list_t *bindings = NULL;
         int i = 0, size = 0;
@@ -3240,7 +3240,7 @@
     endpoint_el = AXIOM_NODE_GET_DATA_ELEMENT(endpoint_el_node, env);
     address = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(endpoint_el, env, WODEN_WSDL10_ATTR_ADDRESS);
 
-    if (NULL != address)
+    if (address)
     {
         axis2_uri_t *address_uri = NULL;
 
@@ -3265,7 +3265,7 @@
     temp_el = axiom_util_get_first_child_element(endpoint_el, env, endpoint_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_feature = NULL;
@@ -3350,7 +3350,7 @@
     feature_el = AXIOM_NODE_GET_DATA_ELEMENT(feature_el_node, env);
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(feature_el, env, WODEN_WSDL10_ATTR_REF);
 
-    if (NULL != ref)
+    if (ref)
     {
         axis2_uri_t *ref_uri = get_uri(env, ref);
         feature = woden_feature_to_feature_element(feature, env);
@@ -3361,7 +3361,7 @@
     attr_req = axis2_qname_create_from_string(env, WODEN_WSDL10_ATTR_REQUIRED);
 
     req = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(feature_el, env, WODEN_WSDL10_ATTR_REQUIRED);
-    if (NULL != req && 0 == AXIS2_STRCMP(WODEN_WSDL10_VALUE_TRUE, req))
+    if (req && 0 == AXIS2_STRCMP(WODEN_WSDL10_VALUE_TRUE, req))
         required = AXIS2_TRUE;
     else
         required = AXIS2_FALSE;
@@ -3386,7 +3386,7 @@
     temp_el = axiom_util_get_first_child_element(feature_el, env, feature_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
 
@@ -3478,7 +3478,7 @@
     property_el = AXIOM_NODE_GET_DATA_ELEMENT(property_el_node, env);
     ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(property_el, env, WODEN_WSDL10_ATTR_REF);
 
-    if (NULL != ref)
+    if (ref)
     {
         axis2_uri_t *ref_uri = get_uri(env, ref);
         property = woden_property_to_property_element(property, env);
@@ -3495,7 +3495,7 @@
     temp_el = axiom_util_get_first_child_element(property_el, env, property_el_node,
             &temp_el_node);
 
-    while (NULL != temp_el && NULL != temp_el_node)
+    while (temp_el && NULL != temp_el_node)
     {
         axis2_qname_t *q_elem_documentation = NULL;
         axis2_qname_t *q_elem_value = NULL;
@@ -3541,7 +3541,7 @@
              * and don't check for extraneous text or child elements?
              */
             node = AXIOM_NODE_GET_FIRST_CHILD(temp_el_node, env);
-            if (NULL != node && AXIOM_TEXT == AXIOM_NODE_GET_NODE_TYPE(
+            if (node && AXIOM_TEXT == AXIOM_NODE_GET_NODE_TYPE(
                         node, env))
             {
                 axis2_char_t *temp_str = NULL;
@@ -3643,7 +3643,7 @@
         }
         if (!prefix) prefix = "";
         attr_type = axis2_qname_create(env, localname, namespc_uri_str, prefix);
-        if (NULL != namespc_uri_str && 0 != AXIS2_STRCMP(namespc_uri_str,
+        if (namespc_uri_str && 0 != AXIS2_STRCMP(namespc_uri_str,
                 WODEN_WSDL10_NS_URI_WSDL20))
         {
             if (0 != AXIS2_STRCMP(namespc_uri_str, WODEN_WSDL10_NS_URI_XMLNS) &&
@@ -3654,11 +3654,11 @@
 
                 desc = woden_wsdl10_desc_to_desc_element(desc, env);
                 ext_reg = WODEN_WSDL10_DESC_ELEMENT_GET_EXT_REGISTRY(desc, env);
-                if (NULL != ext_reg)
+                if (ext_reg)
                 {
                     xml_attr = WODEN_WSDL10_EXT_REGISTRY_QUERY_EXT_ATTR_TYPE(
                                 ext_reg, env, wsdl_class, attr_type);
-                    if (NULL != xml_attr)
+                    if (xml_attr)
                     {
                         axis2_char_t *attr_value = NULL;
                         void *wsdl_el = NULL;

Modified: webservices/axis2/trunk/c/woden/src/schema/schema.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/schema/schema.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/woden/src/schema/schema.c (original)
+++ webservices/axis2/trunk/c/woden/src/schema/schema.c Mon Sep 18 18:39:03 2006
@@ -390,7 +390,7 @@
     schema_impl = INTF_TO_IMPL(axis2_hash_get(super,
             "WODEN_SCHEMA", AXIS2_HASH_KEY_STRING));
 
-    return schema_impl->f_namespc != NULL ?
+    return schema_impl->f_namespc  ?
             AXIS2_URI_TO_STRING(schema_impl->f_namespc, env, AXIS2_URI_UNP_OMITUSERINFO) : NULL;
 }
 

Modified: webservices/axis2/trunk/c/woden/src/util/qname_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/qname_util.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/qname_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/qname_util.c Mon Sep 18 18:39:03 2006
@@ -29,7 +29,7 @@
     axis2_bool_t ret = AXIS2_FALSE;
 
     qname_l = axis2_qname_util_new_qname(env, node);
-    if (NULL != node && AXIS2_TRUE == AXIS2_QNAME_EQUALS(qname, env, qname_l))
+    if (node && AXIS2_TRUE == AXIS2_QNAME_EQUALS(qname, env, qname_l))
         ret = AXIS2_TRUE;
     AXIS2_QNAME_FREE(qname_l, env);
 
@@ -45,7 +45,7 @@
 
     AXIS2_ENV_CHECK(env, NULL);
 
-    if (NULL != node)
+    if (node)
     {
         axiom_namespace_t *namespc = NULL;
         axis2_char_t *uri_str = NULL;

Modified: webservices/axis2/trunk/c/woden/src/util/woden_om_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/util/woden_om_util.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/woden/src/util/woden_om_util.c (original)
+++ webservices/axis2/trunk/c/woden/src/util/woden_om_util.c Mon Sep 18 18:39:03 2006
@@ -49,7 +49,7 @@
     namespc_uri = AXIOM_ELEMENT_FIND_NAMESPACE_URI(context_el,
             env, prefix, context_el_node);
     namespc_uri_str = AXIOM_NAMESPACE_GET_URI(namespc_uri, env);
-    if (NULL != namespc_uri_str)
+    if (namespc_uri_str)
     {
         woden_om_util_register_unique_prefix(env, prefix, namespc_uri_str, namespcs);
         return axis2_qname_create(env, localpart, namespc_uri_str, prefix);
@@ -72,13 +72,13 @@
     ns_uri = axis2_hash_get(namespcs, prefix, AXIS2_HASH_KEY_STRING);
     if (ns_uri)
         ns_uri_str = AXIS2_URI_TO_STRING(ns_uri, env, AXIS2_URI_UNP_OMITUSERINFO);
-    if (NULL != ns_uri_str && 0 == AXIS2_STRCMP(ns_uri_str, namespc_uri_str))
+    if (ns_uri_str && 0 == AXIS2_STRCMP(ns_uri_str, namespc_uri_str))
     {
         /* Namespace already registerd */
         return AXIS2_SUCCESS;
     }
     tmp_prefix = AXIS2_STRDUP(prefix, env);
-    while (NULL != ns_uri_str && 0 != AXIS2_STRCMP(ns_uri_str, namespc_uri_str))
+    while (ns_uri_str && 0 != AXIS2_STRCMP(ns_uri_str, namespc_uri_str))
     {
         axis2_char_t *temp = NULL;
 

Modified: webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_code.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_code.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_code.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_code.c Mon Sep 18 18:39:03 2006
@@ -167,7 +167,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     soap_fault_code_impl = INTF_TO_IMPL(soap_fault_code);
 
-    return (NULL != soap_fault_code_impl->f_code_qn);
+    return (soap_fault_code_impl->f_code_qn);
 }
 
 axis2_bool_t AXIS2_CALL
@@ -180,7 +180,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     soap_fault_code_impl = INTF_TO_IMPL(soap_fault_code);
 
-    return (NULL != soap_fault_code_impl->f_token);
+    return (soap_fault_code_impl->f_token);
 }
 
 axis2_qname_t *AXIS2_CALL

Modified: webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_subcodes.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_subcodes.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_subcodes.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/soap_fault_subcodes.c Mon Sep 18 18:39:03 2006
@@ -191,7 +191,7 @@
     AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
     soap_fault_subcodes_impl = INTF_TO_IMPL(soap_fault_subcodes);
 
-    return (NULL != soap_fault_subcodes_impl->f_token);
+    return (soap_fault_subcodes_impl->f_token);
 }
 
 axis2_array_list_t *AXIS2_CALL

Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_types.c Mon Sep 18 18:39:03 2006
@@ -1029,7 +1029,7 @@
         xml_schema_t *schema_def = WODEN_SCHEMA_GET_SCHEMA_DEF(s,
                 env);
         if (AXIS2_TRUE == WODEN_SCHEMA_IS_REFERENCEABLE(s, env) &&
-                NULL != schema_def)
+                schema_def)
         {
             AXIS2_ARRAY_LIST_ADD(types_impl->schema_defs, env, schema_def);
         }
@@ -1064,7 +1064,7 @@
         xml_schema_t *schema_def =
             WODEN_SCHEMA_GET_SCHEMA_DEF(schema, env);
         if (AXIS2_TRUE == WODEN_SCHEMA_IS_REFERENCEABLE(schema, env) &&
-                0 == AXIS2_STRCMP(namespc, namespc_l) && NULL != schema_def)
+                0 == AXIS2_STRCMP(namespc, namespc_l) &&  schema_def)
         {
             AXIS2_ARRAY_LIST_ADD(types_impl->schema_defs, env, schema_def);
         }

Modified: webservices/axis2/trunk/c/woden/src/wsdl/wsdl_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/wsdl_obj.c?view=diff&rev=447671&r1=447670&r2=447671
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/wsdl_obj.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/wsdl_obj.c Mon Sep 18 18:39:03 2006
@@ -253,7 +253,7 @@
             "WODEN_WSDL_OBJ", AXIS2_HASH_KEY_STRING));
 
     str_namespc = AXIS2_URI_TO_STRING(namespc, env, AXIS2_URI_UNP_OMITUSERINFO);
-    if (NULL != str_namespc)
+    if (str_namespc)
     {
         if (exts)
         {



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


Mime
View raw message