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 sa...@apache.org on 2005/10/24 13:34:45 UTC
svn commit: r328039 - in /webservices/axis2/trunk/c: include/
modules/util/src/ modules/xml/guththila/src/ modules/xml/om/src/
Author: samisa
Date: Mon Oct 24 04:34:22 2005
New Revision: 328039
URL: http://svn.apache.org/viewcvs?rev=328039&view=rev
Log:
removed warnings and moved axis2_qname.c from om to util
Added:
webservices/axis2/trunk/c/modules/util/src/axis2_qname.c
- copied, changed from r328025, webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c
Removed:
webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c
Modified:
webservices/axis2/trunk/c/include/axis2_om_output.h
webservices/axis2/trunk/c/include/axis2_qname.h
webservices/axis2/trunk/c/modules/util/src/Makefile.am
webservices/axis2/trunk/c/modules/util/src/Makefile.in
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c
webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h
webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am
webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c
webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
Modified: webservices/axis2/trunk/c/include/axis2_om_output.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_output.h?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_output.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_output.h Mon Oct 24 04:34:22 2005
@@ -37,7 +37,7 @@
* @{
*/
- static const char *DEFAULT_CHAR_SET_ENCODING = "utf-8";
+ /* static const char *DEFAULT_CHAR_SET_ENCODING = "utf-8"; */
/**
Modified: webservices/axis2/trunk/c/include/axis2_qname.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_qname.h?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_qname.h (original)
+++ webservices/axis2/trunk/c/include/axis2_qname.h Mon Oct 24 04:34:22 2005
@@ -31,7 +31,18 @@
static const axis2_char_t XML_NAMESPACE_URI[] =
"http://www.w3c.org/XML/1998/namespace";
+/**
+ * @defgroup axis2_qname represents qualified name
+ * @ingroup axis2_util
+ * @{
+ */
+/**
+ * \brief Axis2 qname operations struct
+ *
+ * Encapsulator struct for operations of axis2_qname
+ */
+
typedef struct axis2_qname_ops
{
/**
@@ -90,5 +101,8 @@
#define axis2_qname_free(environment,qname) ((qname)->ops->axis2_qname_ops_free(environment,qname))
#define axis2_qname_equals(environment,qname1,qname2) ((qname1)->ops->axis2_qname_ops_equals(environment,qname1,qname2))
+
+/** @} */
+
#endif /* AXIS2_QNAME_H */
Modified: webservices/axis2/trunk/c/modules/util/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/Makefile.am?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/util/src/Makefile.am Mon Oct 24 04:34:22 2005
@@ -7,7 +7,8 @@
axis2_stream.c \
axis2_log.c \
axis2_string.c \
- axis2_file_diff.c
+ axis2_file_diff.c \
+ axis2_qname.c
libaxis2_util_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
Modified: webservices/axis2/trunk/c/modules/util/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/Makefile.in?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/util/src/Makefile.in Mon Oct 24 04:34:22 2005
@@ -65,7 +65,7 @@
libaxis2_util_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libaxis2_util_la_OBJECTS = axis2_hash.lo axis2_allocator.lo \
axis2_environment.lo axis2_error.lo axis2_stream.lo \
- axis2_log.lo axis2_string.lo axis2_file_diff.lo
+ axis2_log.lo axis2_string.lo axis2_file_diff.lo axis2_qname.lo
libaxis2_util_la_OBJECTS = $(am_libaxis2_util_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -200,7 +200,8 @@
axis2_stream.c \
axis2_log.c \
axis2_string.c \
- axis2_file_diff.c
+ axis2_file_diff.c \
+ axis2_qname.c
libaxis2_util_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(top_builddir)/include -I${CUTEST_HOME}/include
@@ -279,6 +280,7 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_file_diff.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_hash.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_log.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_qname.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_stream.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_string.Plo@am__quote@
Copied: webservices/axis2/trunk/c/modules/util/src/axis2_qname.c (from r328025, webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c)
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_qname.c?p2=webservices/axis2/trunk/c/modules/util/src/axis2_qname.c&p1=webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c&r1=328025&r2=328039&rev=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_qname.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_qname.c Mon Oct 24 04:34:22 2005
@@ -16,13 +16,15 @@
#include <axis2_qname.h>
#include <axis2_environment.h>
+#include <axis2_defines.h>
-axis2_status_t axis2_qname_impl_free (axis2_environment_t * environment,
+
+axis2_status_t AXIS2_CALL axis2_qname_impl_free (axis2_environment_t * environment,
axis2_qname_t * qname);
-axis2_bool_t axis2_qname_impl_equals (axis2_environment_t * environment,
+axis2_bool_t AXIS2_CALL axis2_qname_impl_equals (axis2_environment_t * environment,
axis2_qname_t * qn1,
axis2_qname_t * qn2);
-axis2_qname_t *axis2_qname_create (axis2_environment_t * environment,
+axis2_qname_t AXIS2_CALL *axis2_qname_create (axis2_environment_t * environment,
const axis2_char_t * localpart,
const axis2_char_t * namespace_uri,
const axis2_char_t * prefix);
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.c Mon Oct 24 04:34:22 2005
@@ -32,7 +32,7 @@
int empty_element;
};
- guththila_xml_stream_writer_t* guththila_create_xml_stream_writer(guththila_environment_t *environment,FILE* writer, guththila_char_t* encoding, int prefix_defaulting)
+ guththila_xml_stream_writer_t* guththila_create_xml_stream_writer(guththila_environment_t *environment,FILE* writer,guththila_char_t* encoding, int prefix_defaulting)
{
/* guththila_status_t status; */
guththila_xml_stream_writer_t *stream_writer;
Modified: webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h (original)
+++ webservices/axis2/trunk/c/modules/xml/guththila/src/guththila_xml_stream_writer.h Mon Oct 24 04:34:22 2005
@@ -35,7 +35,7 @@
-guththila_xml_stream_writer_t* guththila_create_xml_stream_writer(guththila_environment_t *environment,FILE* writer, guththila_char_t* encoding, int is_prefix_defaulting);
+guththila_xml_stream_writer_t* guththila_create_xml_stream_writer(guththila_environment_t *environment,FILE* writer,guththila_char_t* encoding, int is_prefix_defaulting);
int guththila_xml_stream_writer_end_start_element(guththila_environment_t *environment,guththila_xml_stream_writer_t* stream_writer);
Modified: webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/Makefile.am Mon Oct 24 04:34:22 2005
@@ -7,10 +7,11 @@
axis2_om_comment.c \
axis2_om_element.c \
axis2_om_output.c \
- axis2_qname.c axis2_om_doctype.c \
+ axis2_om_doctype.c \
axis2_om_namespace.c \
axis2_om_processing_instruction.c \
- axis2_om_stax_builder.c
+ axis2_om_stax_builder.c
+
libaxis2_om_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/modules/xml/guththila/src -I${CUTEST_HOME}/include
Modified: webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/Makefile.in Mon Oct 24 04:34:22 2005
@@ -65,9 +65,9 @@
libaxis2_om_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
am_libaxis2_om_la_OBJECTS = axis2_om_attribute.lo axis2_om_document.lo \
axis2_om_node.lo axis2_om_text.lo axis2_om_comment.lo \
- axis2_om_element.lo axis2_om_output.lo axis2_qname.lo \
- axis2_om_doctype.lo axis2_om_namespace.lo \
- axis2_om_processing_instruction.lo axis2_om_stax_builder.lo
+ axis2_om_element.lo axis2_om_output.lo axis2_om_doctype.lo \
+ axis2_om_namespace.lo axis2_om_processing_instruction.lo \
+ axis2_om_stax_builder.lo
libaxis2_om_la_OBJECTS = $(am_libaxis2_om_la_OBJECTS)
DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
depcomp = $(SHELL) $(top_srcdir)/conftools/depcomp
@@ -202,10 +202,10 @@
axis2_om_comment.c \
axis2_om_element.c \
axis2_om_output.c \
- axis2_qname.c axis2_om_doctype.c \
+ axis2_om_doctype.c \
axis2_om_namespace.c \
axis2_om_processing_instruction.c \
- axis2_om_stax_builder.c
+ axis2_om_stax_builder.c
libaxis2_om_la_LIBADD = $(LDFLAGS)
INCLUDES = -I$(top_builddir)/include -I$(top_builddir)/modules/xml/guththila/src -I${CUTEST_HOME}/include
@@ -289,7 +289,6 @@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_om_processing_instruction.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_om_stax_builder.Plo@am__quote@
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_om_text.Plo@am__quote@
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/axis2_qname.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_comment.c Mon Oct 24 04:34:22 2005
@@ -99,5 +99,7 @@
axis2_free (environment->allocator, comment->value);
}
axis2_free (environment->allocator, comment);
+ return AXIS2_SUCCESS;
}
+ return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_doctype.c Mon Oct 24 04:34:22 2005
@@ -104,5 +104,7 @@
axis2_free (environment->allocator, doctype->value);
}
axis2_free (environment->allocator, doctype);
+ return AXIS2_SUCCESS;
}
+ return AXIS2_FAILURE;
}
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_output.c Mon Oct 24 04:34:22 2005
@@ -18,6 +18,8 @@
#include <stdarg.h>
#include <guththila_xml_stream_writer.h>
+#define DEFAULT_CHAR_SET_ENCODING "utf-8"
+
guththila_environment_t *om_output_guththila_environment = NULL;
guththila_allocator_t *om_output_guththila_allocator = NULL;
Modified: webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c?rev=328039&r1=328038&r2=328039&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c (original)
+++ webservices/axis2/trunk/c/modules/xml/om/src/axis2_om_processing_instruction.c Mon Oct 24 04:34:22 2005
@@ -140,5 +140,7 @@
}
axis2_free (environment->allocator, processing_instruction);
+ return AXIS2_SUCCESS;
}
+ return AXIS2_FAILURE;
}