Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 47644 invoked from network); 5 Jan 2007 05:11:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 5 Jan 2007 05:11:39 -0000 Received: (qmail 39168 invoked by uid 500); 5 Jan 2007 05:11:45 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 38893 invoked by uid 500); 5 Jan 2007 05:11:44 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 38882 invoked by uid 500); 5 Jan 2007 05:11:44 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 38879 invoked by uid 99); 5 Jan 2007 05:11:44 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jan 2007 21:11:44 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 04 Jan 2007 21:11:37 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 9C6C41A981A; Thu, 4 Jan 2007 21:10:39 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r492903 - /webservices/axis2/trunk/c/util/src/qname.c Date: Fri, 05 Jan 2007 05:10:39 -0000 To: axis2-cvs@ws.apache.org From: samisa@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070105051039.9C6C41A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: samisa Date: Thu Jan 4 21:10:38 2007 New Revision: 492903 URL: http://svn.apache.org/viewvc?view=rev&rev=492903 Log: More improvements and formatting Modified: webservices/axis2/trunk/c/util/src/qname.c 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=492903&r1=492902&r2=492903 ============================================================================== --- webservices/axis2/trunk/c/util/src/qname.c (original) +++ webservices/axis2/trunk/c/util/src/qname.c Thu Jan 4 21:10:38 2007 @@ -22,7 +22,6 @@ #include #include - struct axis2_qname { /** localpart of qname is mandatory */ @@ -37,12 +36,12 @@ AXIS2_EXTERN axis2_qname_t * AXIS2_CALL axis2_qname_create(const axis2_env_t *env, - const axis2_char_t * localpart, - const axis2_char_t * namespace_uri, - const axis2_char_t * prefix) + const axis2_char_t *localpart, + const axis2_char_t *namespace_uri, + const axis2_char_t *prefix) { - axis2_qname_t *qn = NULL; + axis2_qname_t *qname = NULL; AXIS2_ENV_CHECK(env, NULL); /* localpart can't be null */ @@ -53,65 +52,66 @@ return NULL; } - qn = (axis2_qname_t *) AXIS2_MALLOC(env->allocator, + qname = (axis2_qname_t *) AXIS2_MALLOC(env->allocator, sizeof(axis2_qname_t)); - if (!qn) + if (!qname) { AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE); return NULL; } /* set properties */ - qn->localpart = NULL; - qn->qname_string = NULL; - qn->prefix = NULL; - qn->namespace_uri = NULL; + qname->localpart = NULL; + qname->qname_string = NULL; + qname->prefix = NULL; + qname->namespace_uri = NULL; - qn->localpart = (axis2_char_t *)AXIS2_STRDUP(localpart, env); - if (!(qn->localpart)) + qname->localpart = (axis2_char_t *)AXIS2_STRDUP(localpart, env); + if (!(qname->localpart)) { AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY); AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE); - AXIS2_FREE(env->allocator, qn); + axis2_qname_free(qname, env); return NULL; } + /** if prefix is null it is set to "" */ if (!prefix) { - qn->prefix = (axis2_char_t*)AXIS2_STRDUP("", env); + qname->prefix = (axis2_char_t*)AXIS2_STRDUP("", env); } else { - qn->prefix = (axis2_char_t*)AXIS2_STRDUP(prefix, env); + qname->prefix = (axis2_char_t*)AXIS2_STRDUP(prefix, env); } - if (!(qn->prefix)) + + if (!(qname->prefix)) { AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY); AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE); - AXIS2_FREE(env->allocator, qn->localpart); - AXIS2_FREE(env->allocator, qn); + axis2_qname_free(qname, env); return NULL; } + /** if uri is null it is set to ""*/ if (!namespace_uri) { - qn->namespace_uri = (axis2_char_t*)AXIS2_STRDUP("", env); + qname->namespace_uri = (axis2_char_t*)AXIS2_STRDUP("", env); } else { - qn->namespace_uri = (axis2_char_t*)AXIS2_STRDUP(namespace_uri, env); + qname->namespace_uri = (axis2_char_t*)AXIS2_STRDUP(namespace_uri, env); } - if (!(qn->namespace_uri)) + + if (!(qname->namespace_uri)) { - AXIS2_FREE(env->allocator, qn->localpart); - AXIS2_FREE(env->allocator, qn->prefix); - AXIS2_FREE(env->allocator, qn); AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY); AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE); + axis2_qname_free(qname, env); return NULL; } - return qn; + return qname; } @@ -143,50 +143,51 @@ } AXIS2_FREE(env->allocator, qname); - return AXIS2_SUCCESS; + return AXIS2_SUCCESS; } AXIS2_EXTERN axis2_bool_t AXIS2_CALL axis2_qname_equals(const axis2_qname_t *qname, const axis2_env_t *env, - const axis2_qname_t *qname1) + const axis2_qname_t *qname2) { int uris_differ = 0; int localparts_differ = 0; AXIS2_ENV_CHECK(env, AXIS2_FALSE); - if (!qname1) + if (!qname2) { AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_INVALID_NULL_PARAM); AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE); return AXIS2_FALSE; } - if (qname->localpart && qname1->localpart) + if (qname->localpart && qname2->localpart) { localparts_differ = axis2_strcmp(qname->localpart, - qname1->localpart); + qname2->localpart); } else { - localparts_differ = ((qname->localpart) || (qname1->localpart)); + localparts_differ = ((qname->localpart) || (qname2->localpart)); } - if (qname->namespace_uri && qname1->namespace_uri) + + if (qname->namespace_uri && qname2->namespace_uri) { uris_differ = axis2_strcmp(qname->namespace_uri, - qname1->namespace_uri); + qname2->namespace_uri); } else { - uris_differ = ((qname->namespace_uri) || (qname1->namespace_uri)); + uris_differ = ((qname->namespace_uri) || (qname2->namespace_uri)); } + return (!uris_differ && !localparts_differ) ? AXIS2_TRUE : AXIS2_FALSE; - } @@ -195,13 +196,15 @@ const axis2_env_t *env) { AXIS2_ENV_CHECK(env, NULL); + + if (!qname) + return NULL; + return axis2_qname_create(env, qname->localpart, qname->namespace_uri, qname->prefix); } - - AXIS2_EXTERN axis2_char_t* AXIS2_CALL axis2_qname_get_uri(const axis2_qname_t *qname, const axis2_env_t *env) @@ -236,14 +239,13 @@ { return qname->qname_string; } + if (!(qname->namespace_uri) || AXIS2_STRCMP(qname->namespace_uri, "") == 0) { - /** prefix url both null */ qname->qname_string = AXIS2_STRDUP(qname->localpart, env); } else if (!(qname->prefix) || AXIS2_STRCMP(qname->prefix, "") == 0) { - /** prefix null */ axis2_char_t *temp_string1 = NULL; temp_string1 = AXIS2_STRACAT(qname->localpart, "|", env); @@ -256,7 +258,6 @@ } else { - /** both uri and prefix exist */ axis2_char_t *temp_string1 = NULL; axis2_char_t *temp_string2 = NULL; axis2_char_t *temp_string3 = NULL; @@ -295,7 +296,7 @@ axis2_char_t *index = NULL; axis2_char_t *next = NULL; axis2_char_t *temp_string = NULL; - axis2_qname_t *qn = NULL; + axis2_qname_t *qname = NULL; if (!qstring || AXIS2_STRCMP(qstring, "") == 0) return NULL; @@ -317,24 +318,24 @@ next[index - next] = '\0'; namespace_uri = next; - qn = axis2_qname_create(env, localpart, namespace_uri, prefix); + qname = axis2_qname_create(env, localpart, namespace_uri, prefix); } else { /** only uri and localpart is available */ - qn = axis2_qname_create(env, localpart, next, NULL); + qname = axis2_qname_create(env, localpart, next, NULL); } } else { /** only localpart is there in this qname */ - qn = axis2_qname_create(env, temp_string, NULL, NULL); + qname = axis2_qname_create(env, temp_string, NULL, NULL); } if (temp_string) { AXIS2_FREE(env->allocator, temp_string); temp_string = NULL; } - return qn; + return qname; } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org