You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by da...@apache.org on 2005/11/08 10:52:26 UTC
svn commit: r331763 - in /webservices/axis2/trunk/c: include/
modules/common/src/ modules/core/description/test/ modules/test/util/
modules/util/src/
Author: damitha
Date: Tue Nov 8 01:52:09 2005
New Revision: 331763
URL: http://svn.apache.org/viewcvs?rev=331763&view=rev
Log:
environment env change in env.h
Modified:
webservices/axis2/trunk/c/include/axis2_env.h
webservices/axis2/trunk/c/modules/common/src/Makefile.am
webservices/axis2/trunk/c/modules/common/src/Makefile.in
webservices/axis2/trunk/c/modules/core/description/test/Makefile.am
webservices/axis2/trunk/c/modules/core/description/test/Makefile.in
webservices/axis2/trunk/c/modules/test/util/test_util.c
webservices/axis2/trunk/c/modules/util/src/env.c
Modified: webservices/axis2/trunk/c/include/axis2_env.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_env.h?rev=331763&r1=331762&r2=331763&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_env.h (original)
+++ webservices/axis2/trunk/c/include/axis2_env.h Tue Nov 8 01:52:09 2005
@@ -14,8 +14,8 @@
* limitations under the License.
*/
-#ifndef AXIS2_ENVIRONMENT_H
-#define AXIS2_ENVIRONMENT_H
+#ifndef AXIS2_ENV_H
+#define AXIS2_ENV_H
/**
* @file axis2_env.h
@@ -24,7 +24,7 @@
*/
#include <axis2_allocator.h>
-#include <axis2_error_default.h>
+#include <axis2_error.h>
#include <axis2_stream.h>
#include <axis2_log.h>
@@ -116,12 +116,12 @@
* @param string pointer to an instance of string struct. Optional, can be NULL. If NULL default string handler would be used.
* @return pointer to the newly created environment struct
*/
- AXIS2_DECLARE(axis2_status_t) axis2_environment_free (axis2_env_t *env);
+ AXIS2_DECLARE(axis2_status_t) axis2_env_free (axis2_env_t *env);
/**
*
*/
- AXIS2_DECLARE(axis2_status_t) axis2_environment_check_status (axis2_env_t *env);
+ AXIS2_DECLARE(axis2_status_t) axis2_env_check_status (axis2_env_t *env);
#define AXIS2_ENV_CHECK(env, error_return) \
if(!env || !(*env)) \
@@ -153,4 +153,4 @@
}
#endif
-#endif /* AXIS2_ENVIRONMENT_H */
+#endif /* AXIS2_ENV_H */
Modified: webservices/axis2/trunk/c/modules/common/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/src/Makefile.am?rev=331763&r1=331762&r2=331763&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/common/src/Makefile.am Tue Nov 8 01:52:09 2005
@@ -3,4 +3,6 @@
libaxis2_common_la_SOURCES = axis2.c
libaxis2_common_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
+INCLUDES = -I${CUTEST_HOME}/include \
+ -I$(top_builddir)/modules/util/src \
+ -I$(top_builddir)/include
Modified: webservices/axis2/trunk/c/modules/common/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/common/src/Makefile.in?rev=331763&r1=331762&r2=331763&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/common/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/common/src/Makefile.in Tue Nov 8 01:52:09 2005
@@ -193,7 +193,10 @@
AM_CPPFLAGS = $(CPPFLAGS)
libaxis2_common_la_SOURCES = axis2.c
libaxis2_common_la_LIBADD = $(LDFLAGS)
-INCLUDES = -I${CUTEST_HOME}/include -I$(top_builddir)/include
+INCLUDES = -I${CUTEST_HOME}/include \
+ -I$(top_builddir)/modules/util/src \
+ -I$(top_builddir)/include
+
all: all-am
.SUFFIXES:
Modified: webservices/axis2/trunk/c/modules/core/description/test/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/test/Makefile.am?rev=331763&r1=331762&r2=331763&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/test/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/core/description/test/Makefile.am Tue Nov 8 01:52:09 2005
@@ -7,7 +7,9 @@
libtest_description_la_LIBADD = $(LDFLAGS) -L$(top_builddir)/modules/core/description/src/.libs \
-laxis2_description
-INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
+INCLUDES = -I$(top_builddir)/include \
+ -I$(top_builddir)/modules/util/src \
+ -I${CUTEST_HOME}/include
prgbin_PROGRAMS = description_test
description_test_SOURCES = main.c
Modified: webservices/axis2/trunk/c/modules/core/description/test/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/test/Makefile.in?rev=331763&r1=331762&r2=331763&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/test/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/core/description/test/Makefile.in Tue Nov 8 01:52:09 2005
@@ -213,7 +213,10 @@
libtest_description_la_LIBADD = $(LDFLAGS) -L$(top_builddir)/modules/core/description/src/.libs \
-laxis2_description
-INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
+INCLUDES = -I$(top_builddir)/include \
+ -I$(top_builddir)/modules/util/src \
+ -I${CUTEST_HOME}/include
+
description_test_SOURCES = main.c
description_test_LDADD = $(LDFLAGS) libtest_description.la \
-L$(top_builddir)/modules/core/description/src/.libs -laxis2_description \
Modified: webservices/axis2/trunk/c/modules/test/util/test_util.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/test/util/test_util.c?rev=331763&r1=331762&r2=331763&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/test/util/test_util.c (original)
+++ webservices/axis2/trunk/c/modules/test/util/test_util.c Tue Nov 8 01:52:09 2005
@@ -126,7 +126,7 @@
* test_funct_for_test_env_null
*/
char *msg = test_funct_for_test_env_null(&env);
- int status = axis2_environment_check_status(env);
+ int status = axis2_env_check_status(env);
if(AXIS2_SUCCESS == status)
printf("%s\n", msg);
else
Modified: webservices/axis2/trunk/c/modules/util/src/env.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/env.c?rev=331763&r1=331762&r2=331763&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/env.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/env.c Tue Nov 8 01:52:09 2005
@@ -14,10 +14,12 @@
* limitations under the License.
*/
-#include <axis2_env.h>
#include <stdlib.h>
-AXIS2_DECLARE(axis2_status_t) axis2_environment_free (axis2_env_t *env)
+#include <axis2_env.h>
+#include <axis2_error_default.h>
+
+AXIS2_DECLARE(axis2_status_t) axis2_env_free (axis2_env_t *env)
{
if(NULL != env && NULL != env->allocator)
free (env->allocator);
@@ -105,7 +107,7 @@
AXIS2_DECLARE(axis2_status_t)
-axis2_environment_check_status (axis2_env_t *env)
+axis2_env_check_status (axis2_env_t *env)
{
if(NULL == env)
{