You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by pi...@apache.org on 2008/03/25 09:25:49 UTC
svn commit: r640738 - /webservices/axis2/trunk/c/util/src/qname.c
Author: pini
Date: Tue Mar 25 01:25:45 2008
New Revision: 640738
URL: http://svn.apache.org/viewvc?rev=640738&view=rev
Log:
Fixing jira issue 1067
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?rev=640738&r1=640737&r2=640738&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/qname.c (original)
+++ webservices/axis2/trunk/c/util/src/qname.c Tue Mar 25 01:25:45 2008
@@ -1,4 +1,3 @@
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -42,10 +41,10 @@
AXIS2_EXTERN axutil_qname_t *AXIS2_CALL
axutil_qname_create(
- const axutil_env_t * env,
- const axis2_char_t * localpart,
- const axis2_char_t * namespace_uri,
- const axis2_char_t * prefix)
+ const axutil_env_t *env,
+ const axis2_char_t *localpart,
+ const axis2_char_t *namespace_uri,
+ const axis2_char_t *prefix)
{
axutil_qname_t *qname = NULL;
@@ -56,6 +55,8 @@
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_INVALID_NULL_PARAM,
AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "NULL parameter was passed
+ when a non NULL parameter was expected");
return NULL;
}
@@ -64,6 +65,7 @@
if (!qname)
{
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
return NULL;
}
/* set properties */
@@ -77,6 +79,7 @@
if (!(qname->localpart))
{
AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
axutil_qname_free(qname, env);
return NULL;
@@ -90,6 +93,7 @@
if (prefix && !(qname->prefix))
{
AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
axutil_qname_free(qname, env);
return NULL;
@@ -104,6 +108,7 @@
if (namespace_uri && !(qname->namespace_uri))
{
AXIS2_ERROR_SET_ERROR_NUMBER(env->error, AXIS2_ERROR_NO_MEMORY);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "Out of memory");
AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
axutil_qname_free(qname, env);
return NULL;
@@ -114,8 +119,8 @@
AXIS2_EXTERN void AXIS2_CALL
axutil_qname_free(
- axutil_qname_t * qname,
- const axutil_env_t * env)
+ axutil_qname_t *qname,
+ const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -150,9 +155,9 @@
AXIS2_EXTERN axis2_bool_t AXIS2_CALL
axutil_qname_equals(
- const axutil_qname_t * qname,
- const axutil_env_t * env,
- const axutil_qname_t * qname2)
+ const axutil_qname_t *qname,
+ const axutil_env_t *env,
+ const axutil_qname_t *qname2)
{
int uris_differ = 0;
int localparts_differ = 0;
@@ -163,6 +168,8 @@
{
AXIS2_ERROR_SET_ERROR_NUMBER(env->error,
AXIS2_ERROR_INVALID_NULL_PARAM);
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "NULL parameter was passed
+ when a non NULL parameter was expected");
AXIS2_ERROR_SET_STATUS_CODE(env->error, AXIS2_FAILURE);
return AXIS2_FALSE;
}
@@ -191,8 +198,8 @@
AXIS2_EXTERN axutil_qname_t *AXIS2_CALL
axutil_qname_clone(
- axutil_qname_t * qname,
- const axutil_env_t * env)
+ axutil_qname_t *qname,
+ const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -200,7 +207,6 @@
{
return NULL;
}
-
qname->ref++;
return qname;
@@ -208,8 +214,8 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axutil_qname_get_uri(
- const axutil_qname_t * qname,
- const axutil_env_t * env)
+ const axutil_qname_t *qname,
+ const axutil_env_t *env)
{
AXIS2_PARAM_CHECK(env->error, qname, NULL);
return qname->namespace_uri;
@@ -217,18 +223,17 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axutil_qname_get_prefix(
- const axutil_qname_t * qname,
- const axutil_env_t * env)
+ const axutil_qname_t *qname,
+ const axutil_env_t *env)
{
-
AXIS2_PARAM_CHECK(env->error, qname, NULL);
return qname->prefix;
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axutil_qname_get_localpart(
- const axutil_qname_t * qname,
- const axutil_env_t * env)
+ const axutil_qname_t *qname,
+ const axutil_env_t *env)
{
AXIS2_PARAM_CHECK(env->error, qname, NULL);
return qname->localpart;
@@ -236,8 +241,8 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
axutil_qname_to_string(
- axutil_qname_t * qname,
- const axutil_env_t * env)
+ axutil_qname_t *qname,
+ const axutil_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
if (qname->qname_string)
@@ -289,8 +294,8 @@
AXIS2_EXTERN axutil_qname_t *AXIS2_CALL
axutil_qname_create_from_string(
- const axutil_env_t * env,
- const axis2_char_t * qstring)
+ const axutil_env_t *env,
+ const axis2_char_t *qstring)
{
axis2_char_t *localpart = NULL;
axis2_char_t *namespace_uri = NULL;
@@ -307,10 +312,8 @@
index = strchr(temp_string, '|');
if (index)
{
-
next = index + 1;
temp_string[index - temp_string] = '\0';
-
localpart = temp_string;
index = strchr(next, '|');
@@ -319,19 +322,16 @@
prefix = index + 1;
next[index - next] = '\0';
namespace_uri = next;
-
qname = axutil_qname_create(env, localpart, namespace_uri, prefix);
}
else
{
-
/** only uri and localpart is available */
qname = axutil_qname_create(env, localpart, next, NULL);
}
}
else
{
-
/** only localpart is there in this qname */
qname = axutil_qname_create(env, temp_string, NULL, NULL);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org