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 sa...@apache.org on 2005/10/19 05:32:20 UTC
svn commit: r326354 - in /webservices/axis2/trunk/c: include/
modules/util/src/
Author: samisa
Date: Tue Oct 18 20:32:03 2005
New Revision: 326354
URL: http://svn.apache.org/viewcvs?rev=326354&view=rev
Log:
added coding convention
Modified:
webservices/axis2/trunk/c/include/axis2.h
webservices/axis2/trunk/c/include/axis2_allocator.h
webservices/axis2/trunk/c/include/axis2_defines.h
webservices/axis2/trunk/c/include/axis2_environment.h
webservices/axis2/trunk/c/include/axis2_error.h
webservices/axis2/trunk/c/include/axis2_log.h
webservices/axis2/trunk/c/include/axis2_om_text.h
webservices/axis2/trunk/c/include/axis2_stream.h
webservices/axis2/trunk/c/include/axis2_string.h
webservices/axis2/trunk/c/modules/util/src/axis2_environment.c
webservices/axis2/trunk/c/modules/util/src/axis2_error.c
webservices/axis2/trunk/c/modules/util/src/axis2_log.c
webservices/axis2/trunk/c/modules/util/src/axis2_stream.c
Modified: webservices/axis2/trunk/c/include/axis2.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2.h?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2.h (original)
+++ webservices/axis2/trunk/c/include/axis2.h Tue Oct 18 20:32:03 2005
@@ -9,10 +9,19 @@
#include <stdlib.h>
#include <stdio.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
/** @defgroup axis2 Axis2/C project
* @{
*/
/** @} */
+
+#ifdef __cplusplus
+}
+#endif
#endif /* AXIS2_H */
Modified: webservices/axis2/trunk/c/include/axis2_allocator.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_allocator.h?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_allocator.h (original)
+++ webservices/axis2/trunk/c/include/axis2_allocator.h Tue Oct 18 20:32:03 2005
@@ -19,6 +19,11 @@
#include <axis2_defines.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
typedef struct axis2_allocator
{
void *(*axis2_allocator_malloc)(size_t size);
@@ -39,5 +44,9 @@
#define axis2_malloc(allocator, size) ((allocator)->axis2_allocator_malloc(size))
#define axis2_realloc(allocator, ptr, size) ((allocator)->axis2_allocator_realloc(ptr, size))
#define axis2_free(allocator, ptr) ((allocator)->axis2_allocator_free(ptr))
+
+#ifdef __cplusplus
+}
+#endif
#endif /* AXIS2_ALLOCATOR_H */
Modified: webservices/axis2/trunk/c/include/axis2_defines.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_defines.h?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_defines.h (original)
+++ webservices/axis2/trunk/c/include/axis2_defines.h Tue Oct 18 20:32:03 2005
@@ -8,6 +8,10 @@
#include <stddef.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef char axis2_char_t;
typedef int axis2_bool_t;
typedef int axis2_status_t;
@@ -15,5 +19,9 @@
#define AXIS2_TRUE 1
#define AXIS2_FALSE 0
+
+#ifdef __cplusplus
+}
+#endif
#endif /* AXIS2_DEFINES_H */
Modified: webservices/axis2/trunk/c/include/axis2_environment.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_environment.h?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_environment.h (original)
+++ webservices/axis2/trunk/c/include/axis2_environment.h Tue Oct 18 20:32:03 2005
@@ -23,10 +23,15 @@
#include <axis2_log.h>
#include <axis2_string.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct axis2_environment;
struct axis2_environment_ops;
typedef struct axis2_environment_ops {
+int test;
} axis2_environment_ops_t;
typedef struct axis2_environment {
@@ -39,5 +44,9 @@
} axis2_environment_t;
axis2_environment_t *axis2_environment_create(axis2_allocator_t *allocator, axis2_error_t *error, axis2_stream_t *stream, axis2_log_t *log, axis2_string_t *string);
+
+#ifdef __cplusplus
+}
+#endif
#endif /* AXIS2_ENVIRONMENT_H */
Modified: webservices/axis2/trunk/c/include/axis2_error.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_error.h?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_error.h (original)
+++ webservices/axis2/trunk/c/include/axis2_error.h Tue Oct 18 20:32:03 2005
@@ -20,6 +20,10 @@
#include <axis2_defines.h>
#include <axis2_allocator.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct axis2_error;
struct axis2_error_ops;
@@ -48,6 +52,10 @@
AXIS2_ERROR_INVALID_ITERATOR_STATE,
AXIS2_ERROR_INVALID_NODE_TYPE
} axis2_error_codes_t;
+
+#ifdef __cplusplus
+}
+#endif
#endif /* AXIS2_ERROR_H */
Modified: webservices/axis2/trunk/c/include/axis2_log.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_log.h?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_log.h (original)
+++ webservices/axis2/trunk/c/include/axis2_log.h Tue Oct 18 20:32:03 2005
@@ -19,6 +19,10 @@
#include <axis2_allocator.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef enum axis2_log_levels
{
AXIS2_LOG_DEBUG = 0,
@@ -48,5 +52,8 @@
#define axis2_log_write(log, buffer, count) ((log)->ops->write(buffer, count))
+#ifdef __cplusplus
+}
+#endif
#endif /* AXIS2_LOG_H */
Modified: webservices/axis2/trunk/c/include/axis2_om_text.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_om_text.h?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_om_text.h (original)
+++ webservices/axis2/trunk/c/include/axis2_om_text.h Tue Oct 18 20:32:03 2005
@@ -101,6 +101,7 @@
/**
* Create a text struct and stores it in a node struct and returns a pointer
* to the newly created text struct
+ * @param environment Environment. MUST NOT be NULL, if NULL behaviour is undefined.
* @param parent Parent of the new node. If null newly created node becomes a root node
* The parent element must be of type AXIS2_OM_ELEMENT
* @param value Text value
Modified: webservices/axis2/trunk/c/include/axis2_stream.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_stream.h?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_stream.h (original)
+++ webservices/axis2/trunk/c/include/axis2_stream.h Tue Oct 18 20:32:03 2005
@@ -19,6 +19,10 @@
#include <axis2_allocator.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
struct axis2_stream;
struct axis2_stream_ops;
@@ -35,5 +39,9 @@
#define axis2_stream_read(stream, buffer, count) ((stream)->ops->axis2_stream_read(buffer, count))
#define axis2_stream_write(stream, buffer, count) ((stream)->ops->axis2_stream_write(buffer, count))
+
+#ifdef __cplusplus
+}
+#endif
#endif /* AXIS2_STREAM_H */
Modified: webservices/axis2/trunk/c/include/axis2_string.h
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/include/axis2_string.h?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_string.h (original)
+++ webservices/axis2/trunk/c/include/axis2_string.h Tue Oct 18 20:32:03 2005
@@ -20,6 +20,10 @@
#include <axis2_defines.h>
#include <axis2_allocator.h>
+#ifdef __cplusplus
+extern "C" {
+#endif
+
typedef struct axis2_string
{
void* (*axis2_string_strdup)(const void *ptr);
@@ -38,5 +42,9 @@
#define axis2_strdup(string, ptr) ((string)->axis2_string_strdup(ptr))
#define axis2_strcmp(string, s1, s2) ((string)->axis2_string_strcmp(s1, s2))
+
+#ifdef __cplusplus
+}
+#endif
#endif /* AXIS2_STRING_H */
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_environment.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_environment.c?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_environment.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_environment.c Tue Oct 18 20:32:03 2005
@@ -18,10 +18,11 @@
axis2_environment_t *axis2_environment_create(axis2_allocator_t *allocator, axis2_error_t *error, axis2_stream_t *stream, axis2_log_t *log, axis2_string_t *string)
{
+ axis2_environment_t *environment;
if (!allocator)
return NULL;
- axis2_environment_t *environment = (axis2_environment_t*)axis2_malloc(allocator, sizeof(axis2_environment_t));
+ environment = (axis2_environment_t*)axis2_malloc(allocator, sizeof(axis2_environment_t));
if (!environment)
return NULL;
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_error.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_error.c?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_error.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_error.c Tue Oct 18 20:32:03 2005
@@ -25,10 +25,11 @@
axis2_error_t *axis2_error_create(axis2_allocator_t* allocator)
{
+ axis2_error_t *error;
if (!allocator)
return NULL;
- axis2_error_t *error = (axis2_error_t*)axis2_malloc(allocator, sizeof(axis2_error_t ));
+ error = (axis2_error_t*)axis2_malloc(allocator, sizeof(axis2_error_t ));
if (!error)
return NULL;
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_log.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_log.c?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_log.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_log.c Tue Oct 18 20:32:03 2005
@@ -20,11 +20,12 @@
int axis2_log_ops_write(const void *buffer, size_t count);
axis2_log_t *axis2_log_create(axis2_allocator_t* allocator, axis2_log_ops_t* operations)
-{
+{
+ axis2_log_t *log;
if (!allocator)
return NULL;
- axis2_log_t *log = (axis2_log_t*)axis2_malloc(allocator, sizeof(axis2_log_t));
+ log = (axis2_log_t*)axis2_malloc(allocator, sizeof(axis2_log_t));
if (!log)
return NULL;
@@ -49,10 +50,11 @@
int axis2_log_ops_write(const void *buffer, size_t count)
{
+ int i;
if (!buffer)
return -1;
- int i =0;
+ i =0;
for(i = 0; i < count; i++)
fprintf(stderr, "%c", ((axis2_char_t*)buffer)[i]);
printf("\n");
Modified: webservices/axis2/trunk/c/modules/util/src/axis2_stream.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/src/axis2_stream.c?rev=326354&r1=326353&r2=326354&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/src/axis2_stream.c (original)
+++ webservices/axis2/trunk/c/modules/util/src/axis2_stream.c Tue Oct 18 20:32:03 2005
@@ -22,9 +22,10 @@
axis2_stream_t *axis2_stream_create(axis2_allocator_t* allocator, axis2_stream_ops_t* operations)
{
+ axis2_stream_t *stream;
if (!allocator)
return NULL;
- axis2_stream_t *stream = (axis2_stream_t*)axis2_malloc(allocator, sizeof(axis2_stream_t));
+ stream = (axis2_stream_t*)axis2_malloc(allocator, sizeof(axis2_stream_t));
if (!stream)
return NULL;
@@ -50,10 +51,11 @@
int axis2_stream_ops_read (void *buffer, size_t count)
{
+ int i;
if (!buffer)
return -1;
- int i = 0;
+ i = 0;
for(i = 0; i < count -1; i++ )
{
((axis2_char_t*)buffer)[i] = 'a';
@@ -64,10 +66,11 @@
int axis2_stream_ops_write(const void *buffer, size_t count)
{
+ int i ;
if (!buffer)
return -1;
- int i =0;
+ i =0;
for(i = 0; i < count; i++)
printf("%c", ((axis2_char_t*)buffer)[i]);
return 0;