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 di...@apache.org on 2007/03/08 12:41:15 UTC
svn commit: r516015 - in /webservices/axis2/trunk/c:
modules/core/deployment/ modules/core/transport/http/sender/ util/include/
util/src/ woden/include/ woden/samples/ woden/samples/wsdl10/
woden/src/builder/ woden/src/builder/wsdl10/ woden/src/wsdl/ w...
Author: dinesh
Date: Thu Mar 8 03:41:13 2007
New Revision: 516015
URL: http://svn.apache.org/viewvc?view=rev&rev=516015
Log:
removed macros and code formatted in generic_obj.c
Modified:
webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/util/include/axis2_generic_obj.h
webservices/axis2/trunk/c/util/src/generic_obj.c
webservices/axis2/trunk/c/util/src/param.c
webservices/axis2/trunk/c/woden/include/woden_generic_obj.h
webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c
webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c
webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c
Modified: webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/desc_builder.c Thu Mar 8 03:41:13 2007
@@ -665,8 +665,8 @@
return AXIS2_FAILURE;
}
value = (axiom_attribute_t *) v;
- AXIS2_GENERIC_OBJ_SET_VALUE(obj, env, value);
- AXIS2_GENERIC_OBJ_SET_FREE_FUNC(obj, env,
+ axis2_generic_obj_set_value(obj, env, value);
+ axis2_generic_obj_set_free_func(obj, env,
axiom_attribute_free_void_arg);
attr_qname = AXIOM_ATTRIBUTE_GET_QNAME(value, env);
attr_name = AXIS2_QNAME_TO_STRING(attr_qname, env);
Modified: webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/modules/core/transport/http/sender/http_sender.c Thu Mar 8 03:41:13 2007
@@ -964,7 +964,7 @@
{
return AXIS2_FAILURE;
}
- host_attr = (axiom_attribute_t *)AXIS2_GENERIC_OBJ_GET_VALUE(obj,
+ host_attr = (axiom_attribute_t *) axis2_generic_obj_get_value(obj,
env);
if (NULL == host_attr)
{
@@ -980,7 +980,7 @@
obj = axis2_hash_get(transport_attrs, AXIS2_PROXY_HOST_PORT,
AXIS2_HASH_KEY_STRING);
- port_attr = (axiom_attribute_t*)AXIS2_GENERIC_OBJ_GET_VALUE(obj,
+ port_attr = (axiom_attribute_t*) axis2_generic_obj_get_value(obj,
env);
if (NULL == port_attr)
{
Modified: webservices/axis2/trunk/c/util/include/axis2_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_generic_obj.h?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_generic_obj.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_generic_obj.h Thu Mar 8 03:41:13 2007
@@ -72,26 +72,6 @@
const axis2_env_t *env);
-#define AXIS2_GENERIC_OBJ_FREE(generic_obj, env) \
- axis2_generic_obj_free (generic_obj, env)
-
-#define AXIS2_GENERIC_OBJ_SET_FREE_FUNC(generic_obj, env, free_func) \
- axis2_generic_obj_set_free_func (generic_obj, env, free_func)
-
-#define AXIS2_GENERIC_OBJ_SET_VALUE(generic_obj, env, value) \
- axis2_generic_obj_set_value (generic_obj, env, value)
-
-#define AXIS2_GENERIC_OBJ_GET_VALUE(generic_obj, env) \
- axis2_generic_obj_get_value(generic_obj, env)
-
-#define AXIS2_GENERIC_OBJ_SET_TYPE(generic_obj, env, type) \
- axis2_generic_obj_set_type (generic_obj, env, type)
-
-#define AXIS2_GENERIC_OBJ_GET_TYPE(generic_obj, env) \
- axis2_generic_obj_get_type(generic_obj, env)
-
- /** @} */
-
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/util/src/generic_obj.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/generic_obj.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/util/src/generic_obj.c (original)
+++ webservices/axis2/trunk/c/util/src/generic_obj.c Thu Mar 8 03:41:13 2007
@@ -28,7 +28,6 @@
axis2_generic_obj_create(const axis2_env_t *env)
{
axis2_generic_obj_t *generic_obj = NULL;
-
AXIS2_ENV_CHECK(env, NULL);
generic_obj = (axis2_generic_obj_t *) AXIS2_MALLOC(env->allocator,
@@ -63,13 +62,12 @@
{
AXIS2_FREE(env->allocator, generic_obj->value);
}
- generic_obj->value = NULL;
+
}
if (generic_obj)
{
AXIS2_FREE(env->allocator, generic_obj);
- generic_obj = NULL;
}
return AXIS2_SUCCESS;
}
@@ -79,8 +77,6 @@
const axis2_env_t *env,
AXIS2_FREE_VOID_ARG free_func)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
generic_obj->free_func = free_func;
return AXIS2_SUCCESS;
}
@@ -90,8 +86,6 @@
const axis2_env_t *env,
void *value)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
generic_obj->value = value;
return AXIS2_SUCCESS;
}
@@ -100,8 +94,6 @@
axis2_generic_obj_get_value(axis2_generic_obj_t *generic_obj,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
return generic_obj->value;
}
@@ -111,8 +103,6 @@
const axis2_env_t *env,
int type)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
generic_obj->type = type;
return AXIS2_SUCCESS;
}
@@ -122,8 +112,6 @@
axis2_generic_obj_t *generic_obj,
const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
return generic_obj->type;
}
Modified: webservices/axis2/trunk/c/util/src/param.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/param.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/util/src/param.c (original)
+++ webservices/axis2/trunk/c/util/src/param.c Thu Mar 8 03:41:13 2007
@@ -176,7 +176,7 @@
i = axis2_hash_next(env, i))
{
axis2_hash_this(i, NULL, NULL, &v);
- AXIS2_GENERIC_OBJ_FREE(v, env);
+ axis2_generic_obj_free(v, env);
}
axis2_hash_free(param->attrs, env);
}
@@ -267,7 +267,7 @@
i = axis2_hash_next(env, i))
{
axis2_hash_this(i, NULL, NULL, &v);
- AXIS2_GENERIC_OBJ_FREE(v, env);
+ axis2_generic_obj_free(v, env);
}
axis2_hash_free(param->attrs, env);
}
Modified: webservices/axis2/trunk/c/woden/include/woden_generic_obj.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/include/woden_generic_obj.h?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/woden/include/woden_generic_obj.h (original)
+++ webservices/axis2/trunk/c/woden/include/woden_generic_obj.h Thu Mar 8 03:41:13 2007
@@ -93,19 +93,19 @@
/*************************** Function macros **********************************/
-#define AXIS2_GENERIC_OBJ_FREE(generic_obj, env) \
+#define axis2_generic_obj_free(generic_obj, env) \
((generic_obj)->ops->free (generic_obj, env))
-#define AXIS2_GENERIC_OBJ_SET_FREE_FUNC(generic_obj, env, free_func) \
+#define axis2_generic_obj_set_free_func(generic_obj, env, free_func) \
((generic_obj)->ops->set_free_func (generic_obj, env, free_func))
#define AXIS2_GENERIC_OBJ_SET_SCOPE(generic_obj, env, scope) \
((generic_obj)->ops->set_scope (generic_obj, env, scope))
-#define AXIS2_GENERIC_OBJ_SET_VALUE(generic_obj, env, value) \
+#define axis2_generic_obj_set_value(generic_obj, env, value) \
((generic_obj)->ops->set_value (generic_obj, env, value))
-#define AXIS2_GENERIC_OBJ_GET_VALUE(generic_obj, env) \
+#define axis2_generic_obj_get_value(generic_obj, env) \
((generic_obj)->ops->get_value(generic_obj, env))
/*************************** End of function macros ***************************/
Modified: webservices/axis2/trunk/c/woden/samples/test_wsdl2.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/test_wsdl2.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/test_wsdl2.c (original)
+++ webservices/axis2/trunk/c/woden/samples/test_wsdl2.c Thu Mar 8 03:41:13 2007
@@ -172,7 +172,7 @@
{
void *value = NULL;
- value = AXIS2_GENERIC_OBJ_GET_VALUE(obj, env);
+ value = axis2_generic_obj_get_value(obj, env);
printf("Content is:\n");
}
}
Modified: webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c (original)
+++ webservices/axis2/trunk/c/woden/samples/wsdl10/test_wsdl1.c Thu Mar 8 03:41:13 2007
@@ -181,7 +181,7 @@
{
void *value = NULL;
- value = AXIS2_GENERIC_OBJ_GET_VALUE(obj, env);
+ value = axis2_generic_obj_get_value(obj, env);
printf("Content is:\n");
}
}
Modified: webservices/axis2/trunk/c/woden/src/builder/woden_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/woden_reader.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/woden_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/woden_reader.c Thu Mar 8 03:41:13 2007
@@ -3732,8 +3732,8 @@
/* The property value consists of the child info items of <value> */
node_list = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(temp_el, env, temp_el_node);
node_list_obj = axis2_generic_obj_create(env);
- AXIS2_GENERIC_OBJ_SET_VALUE(node_list_obj, env, node_list);
- AXIS2_GENERIC_OBJ_SET_FREE_FUNC(node_list_obj, env, node_list->ops->free_fn);
+ axis2_generic_obj_set_value(node_list_obj, env, node_list);
+ axis2_generic_obj_set_free_func(node_list_obj, env, node_list->ops->free_fn);
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_VALUE(property, env, node_list_obj);
}
Modified: webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c (original)
+++ webservices/axis2/trunk/c/woden/src/builder/wsdl10/woden_wsdl10_reader.c Thu Mar 8 03:41:13 2007
@@ -3549,8 +3549,8 @@
/* The property value consists of the child info items of <value> */
node_list = AXIOM_ELEMENT_GET_CHILD_ELEMENTS(temp_el, env, temp_el_node);
node_list_obj = axis2_generic_obj_create(env);
- AXIS2_GENERIC_OBJ_SET_VALUE(node_list_obj, env, node_list);
- AXIS2_GENERIC_OBJ_SET_FREE_FUNC(node_list_obj, env, node_list->ops->free_fn);
+ axis2_generic_obj_set_value(node_list_obj, env, node_list);
+ axis2_generic_obj_set_free_func(node_list_obj, env, node_list->ops->free_fn);
property = woden_property_to_property_element(property, env);
WODEN_PROPERTY_ELEMENT_SET_VALUE(property, env, node_list_obj);
}
Modified: webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c (original)
+++ webservices/axis2/trunk/c/woden/src/wsdl/woden_property.c Thu Mar 8 03:41:13 2007
@@ -889,7 +889,7 @@
if (property_impl->f_value)
{
- AXIS2_GENERIC_OBJ_FREE(property_impl->f_value, env);
+ axis2_generic_obj_free(property_impl->f_value, env);
property_impl->f_value = NULL;
}
property_impl->f_value = value;
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_list_or_token_any_attr.c Thu Mar 8 03:41:13 2007
@@ -273,7 +273,7 @@
content = WODEN_XML_ATTR_GET_CONTENT(list_token_attr_impl->xml_attr,
env);
- if (AXIS2_QNAME_LIST == AXIS2_GENERIC_OBJ_GET_TYPE(content, env))
+ if (AXIS2_QNAME_LIST == axis2_generic_obj_get_type(content, env))
return AXIS2_TRUE;
return AXIS2_FALSE;
}
Modified: webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c?view=diff&rev=516015&r1=516014&r2=516015
==============================================================================
--- webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c (original)
+++ webservices/axis2/trunk/c/woden/src/xml/woden_qname_or_token_any_attr.c Thu Mar 8 03:41:13 2007
@@ -276,7 +276,7 @@
env))
return AXIS2_TRUE;
content = WODEN_XML_ATTR_GET_CONTENT(token_attr_impl->xml_attr, env);
- if (AXIS2_QNAME == AXIS2_GENERIC_OBJ_GET_TYPE(content, env))
+ if (AXIS2_QNAME == axis2_generic_obj_get_type(content, env))
return AXIS2_TRUE;
return AXIS2_FALSE;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org