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 mi...@apache.org on 2007/06/25 15:08:30 UTC
svn commit: r550488 [1/3] - in /webservices/axis2/trunk/c/guththila:
include/ src/
Author: milinda
Date: Mon Jun 25 06:08:28 2007
New Revision: 550488
URL: http://svn.apache.org/viewvc?view=rev&rev=550488
Log:
axis environment is added to the guththila code
Modified:
webservices/axis2/trunk/c/guththila/include/guththila.h
webservices/axis2/trunk/c/guththila/include/guththila_attribute.h
webservices/axis2/trunk/c/guththila/include/guththila_buffer.h
webservices/axis2/trunk/c/guththila/include/guththila_namespace.h
webservices/axis2/trunk/c/guththila/include/guththila_reader.h
webservices/axis2/trunk/c/guththila/include/guththila_stack.h
webservices/axis2/trunk/c/guththila/include/guththila_token.h
webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h
webservices/axis2/trunk/c/guththila/src/guththila_attribute.c
webservices/axis2/trunk/c/guththila/src/guththila_buffer.c
webservices/axis2/trunk/c/guththila/src/guththila_namespace.c
webservices/axis2/trunk/c/guththila/src/guththila_reader.c
webservices/axis2/trunk/c/guththila/src/guththila_stack.c
webservices/axis2/trunk/c/guththila/src/guththila_token.c
webservices/axis2/trunk/c/guththila/src/guththila_xml_parser.c
webservices/axis2/trunk/c/guththila/src/guththila_xml_writer.c
Modified: webservices/axis2/trunk/c/guththila/include/guththila.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila.h?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila.h Mon Jun 25 06:08:28 2007
@@ -27,6 +27,7 @@
#include <guththila_stack.h>
#include <guththila_error.h>
+#include <axutil_utils.h>
/*
All the functions in this library does not check weather the given arguments are NULL.
It is the responsblity of the user to check weather the arguments contain NULL values.
@@ -78,8 +79,8 @@
guththila_stack_t attrib;
guththila_stack_t namesp;
- /*int is_whitespace;
- int is_char;*/
+ int is_whitespace;
+ int is_char;
int unicode_state;
int status;
int guththila_event;
@@ -102,23 +103,11 @@
int is_namesp;
} guththila_element_t;
-#ifndef GUTHTHILA_IS_SPACE
-#define GUTHTHILA_IS_SPACE(c) (0x20 == c || 0xD == c || 0xA == c || 0x9 == c)
-#endif
-
-#ifndef GUTHTHILA_IS_VALID_STRING_CHAR
-#define GUTHTHILA_IS_VALID_STRING_CHAR(c) (isalpha(c) || '_' == c || ':' == c)
-#endif
-
-
-#ifndef GUTHTHILA_IS_VALID_STARTING_CHAR
-#define GUTHTHILA_IS_VALID_STARTING_CHAR(c) (isalpha(c) || '_' == c || ':' == c)
-#endif
-
-GUTHTHILA_EXPORT int GUTHTHILA_CALL guththila_init(guththila_t *m, void *reader);
-GUTHTHILA_EXPORT guththila_t* GUTHTHILA_CALL guththila_create(void *reader);
-GUTHTHILA_EXPORT void GUTHTHILA_CALL guththila_free(guththila_t *m);
-GUTHTHILA_EXPORT int GUTHTHILA_CALL guththila_un_init(guththila_t *m);
+
+GUTHTHILA_EXPORT int GUTHTHILA_CALL guththila_init(guththila_t *m, void *reader, axutil_env_t *env);
+GUTHTHILA_EXPORT guththila_t* GUTHTHILA_CALL guththila_create(void *reader, axutil_env_t *env);
+GUTHTHILA_EXPORT void GUTHTHILA_CALL guththila_free(guththila_t *m, axutil_env_t *env);
+GUTHTHILA_EXPORT int GUTHTHILA_CALL guththila_un_init(guththila_t *m, axutil_env_t *env);
@@ -131,66 +120,67 @@
Public functions for reading XML documents
*/
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_next(guththila_t * p);
+guththila_next(guththila_t * p, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_get_attribute_count(guththila_t *p);
+guththila_get_attribute_count(guththila_t *p, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_attribute_name(guththila_t * p, guththila_attr_t * att);
+guththila_get_attribute_name(guththila_t * p, guththila_attr_t * att, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_attribute_value (guththila_t *p, guththila_attr_t * att);
+guththila_get_attribute_value (guththila_t *p, guththila_attr_t * att, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_attribute_prefix (guththila_t *p, guththila_attr_t * att);
+guththila_get_attribute_prefix (guththila_t *p, guththila_attr_t * att, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_attr_t * GUTHTHILA_CALL
-guththila_get_attribute (guththila_t * p);
+guththila_get_attribute (guththila_t * p, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_attribute_name_by_number (guththila_t * p, int i);
+guththila_get_attribute_name_by_number (guththila_t * p, int i, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_attribute_value_by_number (guththila_t * p, int i);
+guththila_get_attribute_value_by_number (guththila_t * p, int i, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_attribute_prefix_by_number (guththila_t * p, int i);
+guththila_get_attribute_prefix_by_number (guththila_t * p, int i, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_name (guththila_t * p);
+guththila_get_name (guththila_t * p, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_prefix (guththila_t * p);
+guththila_get_prefix (guththila_t * p, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_value (guththila_t * p);
+guththila_get_value (guththila_t * p, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_namespace_t * GUTHTHILA_CALL
-guththila_get_namespace (guththila_t * p);
+guththila_get_namespace (guththila_t * p, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_get_namespace_count (guththila_t *p);
+guththila_get_namespace_count (guththila_t *p, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_namespace_uri (guththila_t * p, guththila_namespace_t * ns);
+guththila_get_namespace_uri (guththila_t * p, guththila_namespace_t * ns, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_namespace_prefix (guththila_t *p, guththila_namespace_t * ns);
+guththila_get_namespace_prefix (guththila_t *p, guththila_namespace_t * ns, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_namespace_prefix_by_number (guththila_t * p, int i);
+guththila_get_namespace_prefix_by_number (guththila_t * p, int i, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_namespace_uri_by_number (guththila_t * p, int i);
+guththila_get_namespace_uri_by_number (guththila_t * p, int i, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_attribute_namespace_by_number (guththila_t * p, int i);
+guththila_get_attribute_namespace_by_number (guththila_t * p, int i, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_char * GUTHTHILA_CALL
-guththila_get_encoding (guththila_t *p);
+guththila_get_encoding (guththila_t *p, axutil_env_t *env);
-GUTHTHILA_EXPORT void guththila_set_error_handler(guththila_t *m, guththila_error_func);
+GUTHTHILA_EXPORT void GUTHTHILA_CALL
+guththila_set_error_handler(guththila_t *m, guththila_error_func, axutil_env_t *env);
EXTERN_C_END()
Modified: webservices/axis2/trunk/c/guththila/include/guththila_attribute.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_attribute.h?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_attribute.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_attribute.h Mon Jun 25 06:08:28 2007
@@ -19,6 +19,7 @@
#include <guththila_defines.h>
#include <guththila_token.h>
+#include <axutil_utils.h>
EXTERN_C_START()
@@ -41,12 +42,12 @@
int capacity;
} guththila_attr_list_t;
-guththila_attr_list_t * GUTHTHILA_CALL guththila_attr_list_create();
-int GUTHTHILA_CALL guththila_attr_list_init(guththila_attr_list_t *at_list);
-guththila_attr_t * GUTHTHILA_CALL guththila_attr_list_get(guththila_attr_list_t *at_list);
-int GUTHTHILA_CALL guththila_attr_list_release(guththila_attr_list_t *at_list, guththila_attr_t *attr);
-void GUTHTHILA_CALL msuila_attr_list_free_data(guththila_attr_list_t *at_list);
-void GUTHTHILA_CALL guththila_attr_list_free(guththila_attr_list_t *at_list);
+guththila_attr_list_t * GUTHTHILA_CALL guththila_attr_list_create(axutil_env_t *env);
+int GUTHTHILA_CALL guththila_attr_list_init(guththila_attr_list_t *at_list, axutil_env_t *env);
+guththila_attr_t * GUTHTHILA_CALL guththila_attr_list_get(guththila_attr_list_t *at_list, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_attr_list_release(guththila_attr_list_t *at_list, guththila_attr_t *attr, axutil_env_t *env);
+void GUTHTHILA_CALL msuila_attr_list_free_data(guththila_attr_list_t *at_list, axutil_env_t *env);
+void GUTHTHILA_CALL guththila_attr_list_free(guththila_attr_list_t *at_list, axutil_env_t *env);
EXTERN_C_END()
Modified: webservices/axis2/trunk/c/guththila/include/guththila_buffer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_buffer.h?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_buffer.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_buffer.h Mon Jun 25 06:08:28 2007
@@ -18,11 +18,13 @@
#define GUTHTHILA_BUFFER_H
#include <guththila_defines.h>
+#include <axutil_utils.h>
+
EXTERN_C_START()
-typedef enum guththila_buffer_type {
- GUTHTHILA_BUFFER_MEMORY = 0,
- GUTHTHILA_BUFFER_FILE
+typedef enum guththila_buffer_type {
+ GUTHTHILA_SINGLE_BUFFER = 0,
+ GUTHTHILA_MULTIPLE_BUFFER
} guththila_buffer_type_t;
typedef struct guththila_buffer_s
@@ -66,16 +68,16 @@
#define GUTHTHILA_BUF_POS(_buffer, _pos) ((_buffer).buff[(_buffer).cur_buff] + _pos - (_buffer).pre_tot_data)
#endif
-int GUTHTHILA_CALL guththila_buffer_init(guththila_buffer_t *buffer, int size);
-int GUTHTHILA_CALL guththila_buffer_un_init(guththila_buffer_t *buffer);
-int GUTHTHILA_CALL guththila_buffer_init_for_buffer (guththila_buffer_t *mu_buff, char *buffer, int size);
-
-void * GUTHTHILA_CALL guththila_get_position(guththila_buffer_t *buffer, int pos);
-
-int GUTHTHILA_CALL guththila_buffer_next(guththila_buffer_t * buffer);
-void * GUTHTHILA_CALL guththila_buffer_get(guththila_buffer_t * buffer);
-int GUTHTHILA_CALL guththila_buffer_shift(guththila_buffer_t * buffer, int no);
-int GUTHTHILA_CALL guththila_buffer_insert_data (guththila_buffer_t * buffer, void *buff, size_t buff_len);
+int GUTHTHILA_CALL guththila_buffer_init(guththila_buffer_t *buffer, int size, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_buffer_un_init(guththila_buffer_t *buffer, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_buffer_init_for_buffer (guththila_buffer_t *mu_buff, char *buffer, int size, axutil_env_t *env);
+
+void * GUTHTHILA_CALL guththila_get_position(guththila_buffer_t *buffer, int pos, axutil_env_t *env);
+
+int GUTHTHILA_CALL guththila_buffer_next(guththila_buffer_t * buffer, axutil_env_t *env);
+void * GUTHTHILA_CALL guththila_buffer_get(guththila_buffer_t * buffer, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_buffer_shift(guththila_buffer_t * buffer, int no, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_buffer_insert_data (guththila_buffer_t * buffer, void *buff, size_t buff_len, axutil_env_t *env);
EXTERN_C_END()
#endif
Modified: webservices/axis2/trunk/c/guththila/include/guththila_namespace.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_namespace.h?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_namespace.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_namespace.h Mon Jun 25 06:08:28 2007
@@ -19,6 +19,7 @@
#include <guththila_defines.h>
#include <guththila_token.h>
+#include <axutil_utils.h>
EXTERN_C_START()
@@ -40,12 +41,12 @@
int capacity;
} guththila_namespace_list_t;
-guththila_namespace_list_t * GUTHTHILA_CALL guththila_namespace_list_create();
-int GUTHTHILA_CALL guththila_namespace_list_init(guththila_namespace_list_t *at_list);
-guththila_namespace_t * GUTHTHILA_CALL guththila_namespace_list_get(guththila_namespace_list_t *at_list);
-int GUTHTHILA_CALL guththila_namespace_list_release(guththila_namespace_list_t *at_list, guththila_namespace_t *namesp);
-void GUTHTHILA_CALL msuila_namespace_list_free_data(guththila_namespace_list_t *at_list);
-void GUTHTHILA_CALL guththila_namespace_list_free(guththila_namespace_list_t *at_list);
+guththila_namespace_list_t * GUTHTHILA_CALL guththila_namespace_list_create(axutil_env_t *env);
+int GUTHTHILA_CALL guththila_namespace_list_init(guththila_namespace_list_t *at_list, axutil_env_t *env);
+guththila_namespace_t * GUTHTHILA_CALL guththila_namespace_list_get(guththila_namespace_list_t *at_list, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_namespace_list_release(guththila_namespace_list_t *at_list, guththila_namespace_t *namesp, axutil_env_t *env);
+void GUTHTHILA_CALL msuila_namespace_list_free_data(guththila_namespace_list_t *at_list, axutil_env_t *env);
+void GUTHTHILA_CALL guththila_namespace_list_free(guththila_namespace_list_t *at_list, axutil_env_t *env);
EXTERN_C_END()
Modified: webservices/axis2/trunk/c/guththila/include/guththila_reader.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_reader.h?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_reader.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_reader.h Mon Jun 25 06:08:28 2007
@@ -19,7 +19,7 @@
#include <stdio.h>
#include <guththila_defines.h>
-#include <guththila_buffer.h>
+#include <axutil_utils.h>
EXTERN_C_START()
@@ -37,11 +37,9 @@
{
int type;
FILE *fp;
- /*int next;*/
int last_start; /*if -1 we are not in a token*/
char *buff;
int buff_size;
- /*guththila_buffer_t buffer;*/
GUTHTHILA_READ_INPUT_CALLBACK input_read_callback;
void* context;
} guththila_reader_t;
@@ -55,22 +53,20 @@
#endif
GUTHTHILA_EXPORT guththila_reader_t * GUTHTHILA_CALL
-guththila_reader_create_for_file (char* filename);
+guththila_reader_create_for_file (char* filename, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_reader_t * GUTHTHILA_CALL
-guththila_reader_create_for_io(GUTHTHILA_READ_INPUT_CALLBACK input_read_callback, void *ctx);
+guththila_reader_create_for_io(GUTHTHILA_READ_INPUT_CALLBACK input_read_callback, void *ctx, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_reader_t * GUTHTHILA_CALL
-guththila_reader_create_for_memory(void *buffer, int size);
+guththila_reader_create_for_memory(void *buffer, int size, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_reader_read (guththila_reader_t *r, guththila_char *buffer, int offset, int length);
+guththila_reader_read (guththila_reader_t *r, guththila_char *buffer, int offset, int length, axutil_env_t *env);
GUTHTHILA_EXPORT void GUTHTHILA_CALL
-guththila_reader_free (guththila_reader_t * r);
+guththila_reader_free (guththila_reader_t * r, axutil_env_t *env);
-/*int GUTHTHILA_CALL guththila_reader_next_char(guththila_reader_t *r, int eof);*/
-/*int GUTHTHILA_CALL guththila_reader_next_no_char (guththila_reader_t *r, int eof, char *bytes, int no);*/
EXTERN_C_END()
#endif
Modified: webservices/axis2/trunk/c/guththila/include/guththila_stack.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_stack.h?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_stack.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_stack.h Mon Jun 25 06:08:28 2007
@@ -21,7 +21,7 @@
#include <stdlib.h>
#include <guththila_defines.h>
-
+#include <axutil_utils.h>
#define GUTHTHILA_STACK_DEFAULT 16
EXTERN_C_START()
@@ -43,16 +43,16 @@
#define GUTHTHILA_STACK_TOP_INDEX(_stack) (((_stack).top - 1))
#endif
-guththila_stack_t* GUTHTHILA_CALL guththila_stack_create();
-int GUTHTHILA_CALL guththila_stack_init(guththila_stack_t *stack);
-void GUTHTHILA_CALL guththila_stack_free(guththila_stack_t *stack);
-void GUTHTHILA_CALL guththila_stack_free_data(guththila_stack_t *stack);
-void * GUTHTHILA_CALL guththila_stack_pop(guththila_stack_t *stack);
-int GUTHTHILA_CALL guththila_stack_push(guththila_stack_t *stack, void *data);
-void * GUTHTHILA_CALL guththila_stack_peek(guththila_stack_t *stack);
-void * GUTHTHILA_CALL guththila_stack_get_by_index(guththila_stack_t *stack, int index);
-int GUTHTHILA_CALL guththila_stack_del_top(guththila_stack_t *stack);
-int GUTHTHILA_CALL guththila_stack_is_empty(guththila_stack_t *stack);
+guththila_stack_t* GUTHTHILA_CALL guththila_stack_create(axutil_env_t *env);
+int GUTHTHILA_CALL guththila_stack_init(guththila_stack_t *stack, axutil_env_t *env);
+void GUTHTHILA_CALL guththila_stack_free(guththila_stack_t *stack, axutil_env_t *env);
+void GUTHTHILA_CALL guththila_stack_un_init(guththila_stack_t *stack, axutil_env_t *env);
+void * GUTHTHILA_CALL guththila_stack_pop(guththila_stack_t *stack, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_stack_push(guththila_stack_t *stack, void *data, axutil_env_t *env);
+void * GUTHTHILA_CALL guththila_stack_peek(guththila_stack_t *stack, axutil_env_t *env);
+void * GUTHTHILA_CALL guththila_stack_get_by_index(guththila_stack_t *stack, int index, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_stack_del_top(guththila_stack_t *stack, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_stack_is_empty(guththila_stack_t *stack, axutil_env_t *env);
EXTERN_C_END()
Modified: webservices/axis2/trunk/c/guththila/include/guththila_token.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_token.h?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_token.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_token.h Mon Jun 25 06:08:28 2007
@@ -64,22 +64,22 @@
#endif
#ifndef GUTHTHILA_TOKEN_TO_STRING
-#define GUTHTHILA_TOKEN_TO_STRING(tok, string) \
- string = (char *)malloc((GUTHTHILA_TOKEN_LEN(tok) + 1) * sizeof (char)); \
+#define GUTHTHILA_TOKEN_TO_STRING(tok, string, _env) \
+ string = (char *)AXIS2_MALLOC(_env->allocator, (GUTHTHILA_TOKEN_LEN(tok) + 1) * sizeof (char)); \
memcpy(string, (tok)->start, GUTHTHILA_TOKEN_LEN(tok)); \
string[GUTHTHILA_TOKEN_LEN(tok)] = 0;
#endif
-guththila_tok_list_t * GUTHTHILA_CALL guththila_tok_list_create();
-int GUTHTHILA_CALL guththila_tok_list_init(guththila_tok_list_t *tok_list);
-void GUTHTHILA_CALL guththila_tok_list_free(guththila_tok_list_t *tok_list);
-guththila_token_t * GUTHTHILA_CALL guththila_tok_list_get_token(guththila_tok_list_t *tok_list);
-int GUTHTHILA_CALL guththila_tok_list_release_token(guththila_tok_list_t *tok_list, guththila_token_t *token);
-void GUTHTHILA_CALL guththila_tok_list_free_data(guththila_tok_list_t *tok_list);
-int GUTHTHILA_CALL guththila_tok_list_grow(guththila_tok_list_t *tok_list);
+guththila_tok_list_t * GUTHTHILA_CALL guththila_tok_list_create(axutil_env_t *env);
+int GUTHTHILA_CALL guththila_tok_list_init(guththila_tok_list_t *tok_list, axutil_env_t *env);
+void GUTHTHILA_CALL guththila_tok_list_free(guththila_tok_list_t *tok_list, axutil_env_t *env);
+guththila_token_t * GUTHTHILA_CALL guththila_tok_list_get_token(guththila_tok_list_t *tok_list, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_tok_list_release_token(guththila_tok_list_t *tok_list, guththila_token_t *token, axutil_env_t *env);
+void GUTHTHILA_CALL guththila_tok_list_free_data(guththila_tok_list_t *tok_list, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_tok_list_grow(guththila_tok_list_t *tok_list, axutil_env_t *env);
-int GUTHTHILA_CALL guththila_tok_str_cmp(guththila_token_t *tok, char *str, size_t str_len);
-int GUTHTHILA_CALL guththila_tok_tok_cmp(guththila_token_t *tok1, guththila_token_t *tok2);
+int GUTHTHILA_CALL guththila_tok_str_cmp(guththila_token_t *tok, char *str, size_t str_len, axutil_env_t *env);
+int GUTHTHILA_CALL guththila_tok_tok_cmp(guththila_token_t *tok1, guththila_token_t *tok2, axutil_env_t *env);
EXTERN_C_END()
Modified: webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h (original)
+++ webservices/axis2/trunk/c/guththila/include/guththila_xml_writer.h Mon Jun 25 06:08:28 2007
@@ -21,6 +21,7 @@
#include <guththila_defines.h>
#include <guththila_buffer.h>
#include <guththila.h>
+#include <axutil_utils.h>
EXTERN_C_START()
@@ -114,126 +115,127 @@
/*Writer functions*/
GUTHTHILA_EXPORT guththila_xml_writer_t * GUTHTHILA_CALL
-guththila_create_xml_stream_writer(char *file_name);
+guththila_create_xml_stream_writer(char *file_name, axutil_env_t *env);
GUTHTHILA_EXPORT guththila_xml_writer_t * GUTHTHILA_CALL
-guththila_create_xml_stream_writer_for_memory();
+guththila_create_xml_stream_writer_for_memory(axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_to_buffer (guththila_xml_writer_t *wr, char *buff, int size);
+guththila_write_to_buffer (guththila_xml_writer_t *wr, char *buff, int size, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_namespace (guththila_xml_writer_t *wr, char *prefix, char *uri);
+guththila_write_namespace (guththila_xml_writer_t *wr, char *prefix, char *uri, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
guththila_do_write_attribute_with_prefix_and_namespace (guththila_xml_writer_t *wr,
char *prefix,
char *namespace_uri,
char *local_name,
- char *value);
+ char *value,
+ axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_start_document (guththila_xml_writer_t *wr);
+guththila_write_start_document (guththila_xml_writer_t *wr, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_start_element ( guththila_xml_writer_t *wr, char *start_element);
+guththila_write_start_element ( guththila_xml_writer_t *wr, char *start_element, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_end_element ( guththila_xml_writer_t *wr);
+guththila_write_end_element ( guththila_xml_writer_t *wr, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_close ( guththila_xml_writer_t *wr);
+guththila_close ( guththila_xml_writer_t *wr, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_characters (guththila_xml_writer_t *wr, char *buff);
+guththila_write_characters (guththila_xml_writer_t *wr, char *buff, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_comment (guththila_xml_writer_t *wr, char *buff);
+guththila_write_comment (guththila_xml_writer_t *wr, char *buff, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_escape_character (guththila_xml_writer_t *wr, char *buff);
+guththila_write_escape_character (guththila_xml_writer_t *wr, char *buff, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_empty_element (guththila_xml_writer_t *wr, char *empty_element);
+guththila_write_empty_element (guththila_xml_writer_t *wr, char *empty_element, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_default_namespace (guththila_xml_writer_t *wr, char *namespace_uri);
+guththila_write_default_namespace (guththila_xml_writer_t *wr, char *namespace_uri, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_attribute (guththila_xml_writer_t *wr, char *localname, char *value);
+guththila_write_attribute (guththila_xml_writer_t *wr, char *localname, char *value, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
guththila_write_attribute_with_prefix_and_namespace (guththila_xml_writer_t *wr, char *prefix,
- char *namespace_uri, char *localname, char *value);
+ char *namespace_uri, char *localname, char *value, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
guththila_write_attribute_with_prefix ( guththila_xml_writer_t *wr, char *prefix,
- char *localname, char *value);
+ char *localname, char *value, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
guththila_write_attribute_with_namespace (guththila_xml_writer_t *wr, char *namesp,
- char *localname, char *value);
+ char *localname, char *value, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
guththila_write_start_element_with_prefix_and_namespace (guththila_xml_writer_t *wr, char* prefix,
- char *namespace_uri, char *local_name);
+ char *namespace_uri, char *local_name, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
guththila_write_start_element_with_namespace (guththila_xml_writer_t *wr, char *namespace_uri,
- char *local_name);
+ char *local_name, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_start_element_with_prefix ( guththila_xml_writer_t *wr, char *prefix, char *local_name);
+guththila_write_start_element_with_prefix ( guththila_xml_writer_t *wr, char *prefix, char *local_name, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
guththila_write_empty_element_with_prefix_and_namespace (guththila_xml_writer_t *wr, char* prefix,
- char *namespace_uri, char *local_name);
+ char *namespace_uri, char *local_name, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_empty_element_with_namespace ( guththila_xml_writer_t *wr, char *namespace_uri, char *local_name);
+guththila_write_empty_element_with_namespace ( guththila_xml_writer_t *wr, char *namespace_uri, char *local_name, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_empty_element_with_prefix ( guththila_xml_writer_t *wr, char *prefix, char *local_name);
+guththila_write_empty_element_with_prefix ( guththila_xml_writer_t *wr, char *prefix, char *local_name, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_end_document ( guththila_xml_writer_t *wr);
+guththila_write_end_document ( guththila_xml_writer_t *wr, axutil_env_t *env);
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_write_line ( guththila_xml_writer_t *wr, char *element_name, char *characters);
+guththila_write_line ( guththila_xml_writer_t *wr, char *element_name, char *characters, axutil_env_t *env);
GUTHTHILA_EXPORT char * GUTHTHILA_CALL
-guththila_get_memory_buffer (guththila_xml_writer_t *wr);
+guththila_get_memory_buffer (guththila_xml_writer_t *wr, axutil_env_t *env);
GUTHTHILA_EXPORT unsigned int GUTHTHILA_CALL
-guththila_get_memory_buffer_size(guththila_xml_writer_t *wr);
+guththila_get_memory_buffer_size(guththila_xml_writer_t *wr, axutil_env_t *env);
GUTHTHILA_EXPORT void GUTHTHILA_CALL
-guththila_xml_writer_free (guththila_xml_writer_t *wr);
+guththila_xml_writer_free (guththila_xml_writer_t *wr, axutil_env_t *env);
GUTHTHILA_EXPORT char * GUTHTHILA_CALL
guththila_get_prefix_for_namespace (guththila_xml_writer_t *wr,
- char *namespace);
+ char *namespace, axutil_env_t *env);
/**@description
*
@@ -241,19 +243,19 @@
int GUTHTHILA_CALL
guththila_write(guththila_xml_writer_t *wr,
char *buff,
- size_t buff_size);
+ size_t buff_size, axutil_env_t *env);
/**@description
*
*/
int GUTHTHILA_CALL
guththila_write_token(guththila_xml_writer_t *wr,
- guththila_token_t *tok);
+ guththila_token_t *tok, axutil_env_t *env);
/**@description
*
*/
-int GUTHTHILA_CALL guththila_write_xtoken(guththila_xml_writer_t *wr, char *buff, size_t buff_len);
+int GUTHTHILA_CALL guththila_write_xtoken(guththila_xml_writer_t *wr, char *buff, size_t buff_len, axutil_env_t *env);
EXTERN_C_END()
#endif
Modified: webservices/axis2/trunk/c/guththila/src/guththila_attribute.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_attribute.c?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_attribute.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_attribute.c Mon Jun 25 06:08:28 2007
@@ -20,14 +20,14 @@
#include <stdlib.h>
#include <string.h>
-int GUTHTHILA_CALL guththila_attr_list_grow(guththila_attr_list_t *at_list, int addition)
+int GUTHTHILA_CALL guththila_attr_list_grow(guththila_attr_list_t *at_list, int addition, axutil_env_t *env)
{
int i = 0;
if (addition > 0 || (addition < 0 && at_list->capacity + addition > 0 && at_list->capacity + addition >= at_list->size)) {
at_list->list = (guththila_attr_t *)realloc(at_list->list, sizeof(guththila_attr_t) * (at_list->capacity + addition));
if (at_list->list){
for (i = at_list->capacity; i < at_list->capacity + addition; i++){
- guththila_stack_push(&at_list->fr_stack, at_list->list + i);
+ guththila_stack_push(&at_list->fr_stack, at_list->list + i, env);
}
at_list->capacity += addition;
} else {
@@ -37,63 +37,63 @@
return 0;
}
-guththila_attr_list_t * GUTHTHILA_CALL guththila_attr_list_create()
+guththila_attr_list_t * GUTHTHILA_CALL guththila_attr_list_create(axutil_env_t *env)
{
int i = 0;
- guththila_attr_list_t *at_list = (guththila_attr_list_t *) malloc(sizeof(guththila_attr_list_t));
+ guththila_attr_list_t *at_list = (guththila_attr_list_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_attr_list_t));
if (!at_list) return NULL;
- at_list->list = (guththila_attr_t *)malloc(sizeof(guththila_attr_t) * GUTHTHILA_ATTR_DEF_SIZE);
+ at_list->list = (guththila_attr_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_attr_t) * GUTHTHILA_ATTR_DEF_SIZE);
- if (at_list->list && guththila_stack_init(&at_list->fr_stack)){
+ if (at_list->list && guththila_stack_init(&at_list->fr_stack, env), env){
at_list->capacity = GUTHTHILA_ATTR_DEF_SIZE;
at_list->size = 0;
for (i = 0;i < GUTHTHILA_ATTR_DEF_SIZE; i++){
- guththila_stack_push(&at_list->fr_stack, at_list->list + i);
+ guththila_stack_push(&at_list->fr_stack, at_list->list + i, env);
}
return at_list;
}
return NULL;
}
-int GUTHTHILA_CALL guththila_attr_list_init(guththila_attr_list_t *at_list)
+int GUTHTHILA_CALL guththila_attr_list_init(guththila_attr_list_t *at_list, axutil_env_t *env)
{
int i = 0;
- at_list->list = (guththila_attr_t *)malloc(sizeof(guththila_attr_t) * GUTHTHILA_ATTR_DEF_SIZE);
+ at_list->list = (guththila_attr_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_attr_t) * GUTHTHILA_ATTR_DEF_SIZE);
- if (at_list->list && guththila_stack_init(&at_list->fr_stack)){
+ if (at_list->list && guththila_stack_init(&at_list->fr_stack, env), env){
at_list->capacity = GUTHTHILA_ATTR_DEF_SIZE;
at_list->size = 0;
for (i = 0;i < GUTHTHILA_ATTR_DEF_SIZE; i++){
- guththila_stack_push(&at_list->fr_stack, at_list->list + i);
+ guththila_stack_push(&at_list->fr_stack, at_list->list + i, env);
}
return GUTHTHILA_SUCCESS;
}
return GUTHTHILA_FAILURE;
}
-guththila_attr_t * GUTHTHILA_CALL guththila_attr_list_get(guththila_attr_list_t *at_list)
+guththila_attr_t * GUTHTHILA_CALL guththila_attr_list_get(guththila_attr_list_t *at_list, axutil_env_t *env)
{
- if (at_list->fr_stack.top > 0 || guththila_attr_list_grow(at_list, GUTHTHILA_ATTR_DEF_SIZE)){
- return guththila_stack_pop(&at_list->fr_stack);
+ if (at_list->fr_stack.top > 0 || guththila_attr_list_grow(at_list, GUTHTHILA_ATTR_DEF_SIZE, env)){
+ return guththila_stack_pop(&at_list->fr_stack, env);
}
return NULL;
}
-int GUTHTHILA_CALL guththila_attr_list_release(guththila_attr_list_t *at_list, guththila_attr_t *attr)
+int GUTHTHILA_CALL guththila_attr_list_release(guththila_attr_list_t *at_list, guththila_attr_t *attr, axutil_env_t *env)
{
- return guththila_stack_push(&at_list->fr_stack, attr);
+ return guththila_stack_push(&at_list->fr_stack, attr, env);
}
-void GUTHTHILA_CALL msuila_attr_list_free_data(guththila_attr_list_t *at_list)
+void GUTHTHILA_CALL msuila_attr_list_free_data(guththila_attr_list_t *at_list, axutil_env_t *env)
{
- free(at_list->list);
- guththila_stack_free_data(&at_list->fr_stack);
+ AXIS2_FREE(env->allocator, at_list->list);
+ guththila_stack_un_init(&at_list->fr_stack, env);
}
-void GUTHTHILA_CALL guththila_attr_list_free(guththila_attr_list_t *at_list)
+void GUTHTHILA_CALL guththila_attr_list_free(guththila_attr_list_t *at_list, axutil_env_t *env)
{
- free(at_list->list);
- guththila_stack_free_data(&at_list->fr_stack);
- free(at_list);
+ AXIS2_FREE(env->allocator, at_list->list);
+ guththila_stack_un_init(&at_list->fr_stack, env);
+ AXIS2_FREE(env->allocator, at_list);
}
Modified: webservices/axis2/trunk/c/guththila/src/guththila_buffer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_buffer.c?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_buffer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_buffer.c Mon Jun 25 06:08:28 2007
@@ -19,18 +19,18 @@
#include <string.h>
#include <guththila_buffer.h>
-int GUTHTHILA_CALL guththila_buffer_init(guththila_buffer_t *buffer, int size)
+int GUTHTHILA_CALL guththila_buffer_init(guththila_buffer_t *buffer, int size, axutil_env_t *env)
{
- buffer->type = GUTHTHILA_BUFFER_FILE;
+ buffer->type = GUTHTHILA_MULTIPLE_BUFFER;
- buffer->data_size = (size_t *)malloc(sizeof(size_t) * GUTHTHILA_BUFFER_NUMBER_OF_BUFFERS);
- buffer->buffs_size = (size_t *)malloc(sizeof(size_t) * GUTHTHILA_BUFFER_NUMBER_OF_BUFFERS);
- buffer->buff = (char **)malloc(sizeof(char *) * GUTHTHILA_BUFFER_NUMBER_OF_BUFFERS);
+ buffer->data_size = (size_t *)AXIS2_MALLOC(env->allocator, sizeof(size_t) * GUTHTHILA_BUFFER_NUMBER_OF_BUFFERS);
+ buffer->buffs_size = (size_t *)AXIS2_MALLOC(env->allocator, sizeof(size_t) * GUTHTHILA_BUFFER_NUMBER_OF_BUFFERS);
+ buffer->buff = (char **)AXIS2_MALLOC(env->allocator, sizeof(char *) * GUTHTHILA_BUFFER_NUMBER_OF_BUFFERS);
buffer->cur_buff = -1;
buffer->pre_tot_data = 0;
buffer->no_buffers = GUTHTHILA_BUFFER_NUMBER_OF_BUFFERS;
if (size > 0 ){
- buffer->buff[0] = (guththila_char *)malloc(sizeof(guththila_char) * size);
+ buffer->buff[0] = (guththila_char *)AXIS2_MALLOC(env->allocator, sizeof(guththila_char) * size);
buffer->data_size[0] = 0;
buffer->buffs_size[0] = size;
buffer->cur_buff = 0;
@@ -38,105 +38,50 @@
return GUTHTHILA_SUCCESS;
}
-int GUTHTHILA_CALL guththila_buffer_un_init(guththila_buffer_t *buffer)
+int GUTHTHILA_CALL guththila_buffer_un_init(guththila_buffer_t *buffer, axutil_env_t *env)
{
int i = 0;
- if (buffer->type == GUTHTHILA_BUFFER_MEMORY && buffer->buff && buffer->cur_buff == 0) {
- if (buffer->buff[0]) free(buffer->buff[0]);
- if (buffer->buffs_size) free(buffer->buffs_size);
- if (buffer->data_size) free(buffer->data_size);
- free(buffer->buff);
- } else if (buffer->type == GUTHTHILA_BUFFER_MEMORY && buffer->buff){
+ if (buffer->type == GUTHTHILA_SINGLE_BUFFER && buffer->buff && buffer->cur_buff == 0) {
+ if (buffer->buff[0]) AXIS2_FREE(env->allocator, buffer->buff[0]);
+ if (buffer->buffs_size) AXIS2_FREE(env->allocator, buffer->buffs_size);
+ if (buffer->data_size) AXIS2_FREE(env->allocator, buffer->data_size);
+ AXIS2_FREE(env->allocator, buffer->buff);
+ } else if (buffer->type == GUTHTHILA_MULTIPLE_BUFFER && buffer->buff){
for (i = 0; i <= buffer->cur_buff; i++) {
- free(buffer->buff[i]);
+ AXIS2_FREE(env->allocator, buffer->buff[i]);
}
- free(buffer->buff);
- if (buffer->data_size) free(buffer->data_size);
- if (buffer->buffs_size) free(buffer->buffs_size);
+ AXIS2_FREE(env->allocator, buffer->buff);
+ if (buffer->data_size) AXIS2_FREE(env->allocator, buffer->data_size);
+ if (buffer->buffs_size) AXIS2_FREE(env->allocator, buffer->buffs_size);
}
return GUTHTHILA_SUCCESS;
}
-int GUTHTHILA_CALL guththila_buffer_init_for_buffer (guththila_buffer_t *buffer, char *buff, int size)
+int GUTHTHILA_CALL guththila_buffer_init_for_buffer(guththila_buffer_t *buffer, char *buff, int size, axutil_env_t *env)
{
- buffer->type = GUTHTHILA_BUFFER_MEMORY;
+ buffer->type = GUTHTHILA_SINGLE_BUFFER;
- buffer->buff = (char **)malloc(sizeof(char *) * GUTHTHILA_BUFFER_DEF_SIZE);
+ buffer->buff = (char **)AXIS2_MALLOC(env->allocator, sizeof(char *) * GUTHTHILA_BUFFER_DEF_SIZE);
buffer->buff[0] = buff;
buffer->cur_buff = 0;
- buffer->buffs_size = (size_t *)malloc(sizeof(size_t) * GUTHTHILA_BUFFER_DEF_SIZE);
+ buffer->buffs_size = (size_t *)AXIS2_MALLOC(env->allocator, sizeof(size_t) * GUTHTHILA_BUFFER_DEF_SIZE);
buffer->buffs_size[0] = size;
buffer->pre_tot_data = 0;
- buffer->data_size = (size_t *)malloc(sizeof(size_t) * GUTHTHILA_BUFFER_DEF_SIZE);
+ buffer->data_size = (size_t *)AXIS2_MALLOC(env->allocator, sizeof(size_t) * GUTHTHILA_BUFFER_DEF_SIZE);
buffer->data_size[0] = size;
buffer->no_buffers = 1;
return GUTHTHILA_SUCCESS;
}
-
-int GUTHTHILA_CALL guththila_buffer_insert_data (guththila_buffer_t * buffer, void *buff, size_t buff_len)
+void * GUTHTHILA_CALL guththila_buffer_get(guththila_buffer_t * buffer, axutil_env_t *env)
{
- size_t no_written = 0;
- if (buffer->data_size[buffer->cur_buff] + buff_len <= buffer->buffs_size[buffer->cur_buff]) {
- memcpy(buffer->buff[buffer->cur_buff] + buffer->cur_buff_pos, buff, buff_len);
- } else {
- do {
- if (buff_len > no_written + buffer->buffs_size[buffer->cur_buff] - buffer->cur_buff_pos) {
- memcpy(buffer->buff[buffer->cur_buff] + buffer->cur_buff_pos, (char *)buff + no_written, buffer->buffs_size[buffer->cur_buff] - buffer->cur_buff_pos);
- no_written = buffer->buffs_size[buffer->cur_buff] - buffer->cur_buff_pos;
- buffer->data_size[buffer->cur_buff] = buffer->buffs_size[buffer->cur_buff];
- if (buffer->cur_buff == buffer->no_buffers - 1) {
- buffer->data_size = (size_t *)realloc(buffer->data_size, buffer->no_buffers * 2);
- buffer->buffs_size = (size_t *)realloc(buffer->data_size, buffer->no_buffers * 2);
- buffer->buff = (char **)realloc(buffer->buff, buffer->no_buffers * 2);
- buffer->no_buffers *= 2;
- }
- buffer->buff[buffer->cur_buff + 1] = (char *)malloc(sizeof(char) * buffer->data_size[buffer->cur_buff] * 2);
- buffer->cur_buff++;
- buffer->buffs_size[buffer->cur_buff] = buffer->data_size[buffer->cur_buff - 1] * 2;
- buffer->data_size[buffer->cur_buff] = 0;
- buffer->pre_tot_data += buffer->data_size[buffer->cur_buff - 1];
- } else {
- memcpy(buffer->buff[buffer->cur_buff] + buffer->cur_buff_pos, (char *)buff + no_written, buff_len - no_written);
- buffer->data_size[buffer->cur_buff] = 0;
- break;
- }
- } while (1);
- }
- return GUTHTHILA_SUCCESS;
-}
-
-int GUTHTHILA_CALL guththila_buffer_shift(guththila_buffer_t * buffer, int no)
-{
- size_t i = 0, sum = 0, data_move = 0;
- for (i = 0; i < (size_t)buffer->cur_buff; i++) {
- sum += buffer->data_size[i];
- }
- data_move = buffer->data_size[buffer->cur_buff] - (no - sum);
- if (buffer->cur_buff == buffer->no_buffers - 1) {
- buffer->data_size = (size_t *)realloc(buffer->data_size, buffer->no_buffers * 2);
- buffer->buffs_size = (size_t *)realloc(buffer->data_size, buffer->no_buffers * 2);
- buffer->buff = (char **)realloc(buffer->buff, buffer->no_buffers * 2);
- buffer->no_buffers *= 2;
- }
- buffer->buff[buffer->cur_buff + 1] = (char *)malloc(sizeof(char) * buffer->data_size[buffer->cur_buff] * 2);
- buffer->cur_buff++;
- buffer->buffs_size[buffer->cur_buff] = buffer->data_size[buffer->cur_buff - 1] * 2;
- buffer->data_size[buffer->cur_buff] = data_move;
- memcpy(buffer->buff[buffer->cur_buff], buffer->buff[buffer->cur_buff - 1] + buffer->data_size[buffer->cur_buff] - data_move, data_move);
- buffer->data_size[buffer->cur_buff] -= data_move;
- buffer->pre_tot_data += buffer->data_size[buffer->cur_buff - 1];
- return GUTHTHILA_SUCCESS;
-}
-
-void * GUTHTHILA_CALL guththila_buffer_get(guththila_buffer_t * buffer)
-{
- size_t size = 0, i = 0, current_size = 0;
+ size_t size = 0, current_size = 0;
+ int i = 0;
char *buff = NULL;
- for (i = 0; i <= (size_t)buffer->cur_buff; i++) {
+ for (i = 0; i <= buffer->cur_buff; i++) {
size += buffer->data_size[i];
}
- buff = (char *) malloc(sizeof(char) * size);
+ buff = (char *) AXIS2_MALLOC(env->allocator, sizeof(char) * size);
for (i = 0; i <= buffer->cur_buff; i++) {
memcpy(buff + current_size, buffer->buff[i] , buffer->data_size[i]);
@@ -145,11 +90,5 @@
return buff;
}
-void * GUTHTHILA_CALL guththila_get_position(guththila_buffer_t *buffer, int pos)
-{
- if (pos > buffer->pre_tot_data) {
- return buffer->buff[buffer->cur_buff] + pos - buffer->pre_tot_data;
- }
- return NULL;
-}
+
Modified: webservices/axis2/trunk/c/guththila/src/guththila_namespace.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_namespace.c?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_namespace.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_namespace.c Mon Jun 25 06:08:28 2007
@@ -20,14 +20,14 @@
#include <stdlib.h>
#include <string.h>
-int GUTHTHILA_CALL guththila_namespace_list_grow(guththila_namespace_list_t *namesp_list, int addition)
+int GUTHTHILA_CALL guththila_namespace_list_grow(guththila_namespace_list_t *namesp_list, int addition, axutil_env_t *env)
{
int i = 0;
if (addition > 0 || (addition < 0 && namesp_list->capacity + addition > 0 && namesp_list->capacity + addition >= namesp_list->size)) {
namesp_list->list = (guththila_namespace_t *)realloc(namesp_list->list, sizeof(guththila_namespace_t) * (namesp_list->capacity + addition));
if (namesp_list->list){
for (i = namesp_list->capacity; i < namesp_list->capacity + addition; i++){
- guththila_stack_push(&namesp_list->fr_stack, namesp_list->list + i);
+ guththila_stack_push(&namesp_list->fr_stack, namesp_list->list + i, env);
}
namesp_list->capacity += addition;
} else {
@@ -37,63 +37,63 @@
return 0;
}
-guththila_namespace_list_t * GUTHTHILA_CALL guththila_namespace_list_create()
+guththila_namespace_list_t * GUTHTHILA_CALL guththila_namespace_list_create(axutil_env_t *env)
{
int i = 0;
- guththila_namespace_list_t *namesp_list = (guththila_namespace_list_t *) malloc(sizeof(guththila_namespace_list_t));
+ guththila_namespace_list_t *namesp_list = (guththila_namespace_list_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_namespace_list_t));
if (!namesp_list) return NULL;
- namesp_list->list = (guththila_namespace_t *)malloc(sizeof(guththila_namespace_t) * GUTHTHILA_NAMESPACE_DEF_SIZE);
+ namesp_list->list = (guththila_namespace_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_namespace_t) * GUTHTHILA_NAMESPACE_DEF_SIZE);
- if (namesp_list->list && guththila_stack_init(&namesp_list->fr_stack)){
+ if (namesp_list->list && guththila_stack_init(&namesp_list->fr_stack, env)){
namesp_list->capacity = GUTHTHILA_NAMESPACE_DEF_SIZE;
namesp_list->size = 0;
for (i = 0;i < GUTHTHILA_NAMESPACE_DEF_SIZE; i++){
- guththila_stack_push(&namesp_list->fr_stack, namesp_list->list + i);
+ guththila_stack_push(&namesp_list->fr_stack, namesp_list->list + i, env);
}
return namesp_list;
}
return NULL;
}
-int GUTHTHILA_CALL guththila_namespace_list_init(guththila_namespace_list_t *namesp_list)
+int GUTHTHILA_CALL guththila_namespace_list_init(guththila_namespace_list_t *namesp_list, axutil_env_t *env)
{
int i = 0;
- namesp_list->list = (guththila_namespace_t *)malloc(sizeof(guththila_namespace_t) * GUTHTHILA_NAMESPACE_DEF_SIZE);
+ namesp_list->list = (guththila_namespace_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_namespace_t) * GUTHTHILA_NAMESPACE_DEF_SIZE);
- if (namesp_list->list && guththila_stack_init(&namesp_list->fr_stack)){
+ if (namesp_list->list && guththila_stack_init(&namesp_list->fr_stack, env)){
namesp_list->capacity = GUTHTHILA_NAMESPACE_DEF_SIZE;
namesp_list->size = 0;
for (i = 0;i < GUTHTHILA_NAMESPACE_DEF_SIZE; i++){
- guththila_stack_push(&namesp_list->fr_stack, namesp_list->list + i);
+ guththila_stack_push(&namesp_list->fr_stack, namesp_list->list + i, env);
}
return GUTHTHILA_SUCCESS;
}
return GUTHTHILA_FAILURE;
}
-guththila_namespace_t * GUTHTHILA_CALL guththila_namespace_list_get(guththila_namespace_list_t *namesp_list)
+guththila_namespace_t * GUTHTHILA_CALL guththila_namespace_list_get(guththila_namespace_list_t *namesp_list, axutil_env_t *env)
{
- if (namesp_list->fr_stack.top > 0 || guththila_namespace_list_grow(namesp_list, GUTHTHILA_NAMESPACE_DEF_SIZE)){
- return guththila_stack_pop(&namesp_list->fr_stack);
+ if (namesp_list->fr_stack.top > 0 || guththila_namespace_list_grow(namesp_list, GUTHTHILA_NAMESPACE_DEF_SIZE, env)){
+ return guththila_stack_pop(&namesp_list->fr_stack, env);
}
return NULL;
}
-int GUTHTHILA_CALL guththila_namespace_list_release(guththila_namespace_list_t *namesp_list, guththila_namespace_t *namespace)
+int GUTHTHILA_CALL guththila_namespace_list_release(guththila_namespace_list_t *namesp_list, guththila_namespace_t *namespace, axutil_env_t *env)
{
- return guththila_stack_push(&namesp_list->fr_stack, namespace);
+ return guththila_stack_push(&namesp_list->fr_stack, namespace, env);
}
-void GUTHTHILA_CALL msuila_namespace_list_free_data(guththila_namespace_list_t *namesp_list)
+void GUTHTHILA_CALL msuila_namespace_list_free_data(guththila_namespace_list_t *namesp_list, axutil_env_t *env)
{
- free(namesp_list->list);
- guththila_stack_free_data(&namesp_list->fr_stack);
+ AXIS2_FREE(env->allocator, namesp_list->list);
+ guththila_stack_un_init(&namesp_list->fr_stack, env);
}
-void GUTHTHILA_CALL guththila_namespace_list_free(guththila_namespace_list_t *namesp_list)
+void GUTHTHILA_CALL guththila_namespace_list_free(guththila_namespace_list_t *namesp_list, axutil_env_t *env)
{
- free(namesp_list->list);
- guththila_stack_free_data(&namesp_list->fr_stack);
- free(namesp_list);
+ AXIS2_FREE(env->allocator, namesp_list->list);
+ guththila_stack_un_init(&namesp_list->fr_stack, env);
+ AXIS2_FREE(env->allocator, namesp_list);
}
Modified: webservices/axis2/trunk/c/guththila/src/guththila_reader.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_reader.c?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_reader.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_reader.c Mon Jun 25 06:08:28 2007
@@ -19,75 +19,64 @@
#include <guththila_reader.h>
GUTHTHILA_EXPORT guththila_reader_t * GUTHTHILA_CALL
-guththila_reader_create_for_file (char* file_name)
+guththila_reader_create_for_file (char* file_name, axutil_env_t *env)
{
guththila_reader_t *reader = NULL;
FILE *f = NULL;
if (!file_name)
return NULL;
- reader = (guththila_reader_t *) malloc(sizeof(guththila_reader_t));
+ reader = (guththila_reader_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_reader_t));
if (!reader)
return NULL;
f = fopen(file_name, "r");
if (!f) {
- free(reader);
+ AXIS2_FREE(env->allocator, reader);
return NULL;
}
reader->fp = f;
- reader->type = GUTHTHILA_FILE_READER;
- /*guththila_buffer_init(&reader->buffer, 0);*/
- /*reader->next = 0;*/
- /*reader->last_start = -1;*/
+ reader->type = GUTHTHILA_FILE_READER;
return reader;
}
GUTHTHILA_EXPORT guththila_reader_t * GUTHTHILA_CALL
-guththila_reader_create_for_memory(void *buffer, int size)
+guththila_reader_create_for_memory(void *buffer, int size, axutil_env_t *env)
{
- guththila_reader_t *reader = (guththila_reader_t *) malloc(sizeof(guththila_reader_t));
+ guththila_reader_t *reader = (guththila_reader_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_reader_t));
if (reader) {
- reader->type = GUTHTHILA_MEMORY_READER;
- /*guththila_buffer_init_for_buffer(&reader->buffer, buffer, size); */
- reader->buff = buffer;
- /*memcpy(reader->buff, buffer, size);*/
+ reader->type = GUTHTHILA_MEMORY_READER;
+ reader->buff = buffer;
reader->buff_size = size;
- reader->fp = NULL;
- /*reader->next = 0;
- reader->last_start = -1;*/
+ reader->fp = NULL;
return reader;
}
return NULL;
}
GUTHTHILA_EXPORT guththila_reader_t * GUTHTHILA_CALL
-guththila_reader_create_for_io(GUTHTHILA_READ_INPUT_CALLBACK input_read_callback, void *ctx)
+guththila_reader_create_for_io(GUTHTHILA_READ_INPUT_CALLBACK input_read_callback, void *ctx, axutil_env_t *env)
{
- guththila_reader_t *reader = (guththila_reader_t *)malloc(sizeof(guththila_reader_t));
+ guththila_reader_t *reader = (guththila_reader_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_reader_t));
if (reader){
reader->input_read_callback = input_read_callback;
reader->context = ctx;
- reader->type = GUTHTHILA_IO_READER;
- /*reader->next = 0;*/
- /*guththila_buffer_init(&reader->buffer, 0);*/
- /*reader->last_start = -1;*/
+ reader->type = GUTHTHILA_IO_READER;
return reader;
}
return NULL;
}
GUTHTHILA_EXPORT void GUTHTHILA_CALL
-guththila_reader_free (guththila_reader_t * r)
+guththila_reader_free(guththila_reader_t * r, axutil_env_t *env)
{
if (r->type == GUTHTHILA_FILE_READER && r->fp){
fclose(r->fp);
- }
- /*guththila_buffer_un_init(&r->buffer);*/
- free(r);
+ }
+ AXIS2_FREE(env->allocator, r);
}
GUTHTHILA_EXPORT int GUTHTHILA_CALL
-guththila_reader_read (guththila_reader_t *r, guththila_char *buffer, int offset, int length)
+guththila_reader_read (guththila_reader_t *r, guththila_char *buffer, int offset, int length, axutil_env_t *env)
{
int rt = r->type;
switch (rt) {
Modified: webservices/axis2/trunk/c/guththila/src/guththila_stack.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_stack.c?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_stack.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_stack.c Mon Jun 25 06:08:28 2007
@@ -16,18 +16,18 @@
*/
#include <guththila_stack.h>
-guththila_stack_t* GUTHTHILA_CALL guththila_stack_create()
+guththila_stack_t* GUTHTHILA_CALL guththila_stack_create(axutil_env_t *env)
{
guththila_stack_t *stack = NULL;
- stack = (guththila_stack_t *)malloc(sizeof(guththila_stack_t));
+ stack = (guththila_stack_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_stack_t));
if (!stack) return NULL;
stack->data = NULL;
- stack->data = (void **)malloc(sizeof(void **) * GUTHTHILA_STACK_DEFAULT);
+ stack->data = (void **)AXIS2_MALLOC(env->allocator, sizeof(void **) * GUTHTHILA_STACK_DEFAULT);
if (!stack->data){
- free(stack);
+ AXIS2_FREE(env->allocator, stack);
return NULL;
} else {
stack->max = GUTHTHILA_STACK_DEFAULT;
@@ -36,10 +36,10 @@
}
}
-int GUTHTHILA_CALL guththila_stack_init(guththila_stack_t *stack)
+int GUTHTHILA_CALL guththila_stack_init(guththila_stack_t *stack, axutil_env_t *env)
{
stack->top = 0;
- stack->data = (void **)malloc(sizeof(void **) * GUTHTHILA_STACK_DEFAULT);
+ stack->data = (void **)AXIS2_MALLOC(env->allocator, sizeof(void **) * GUTHTHILA_STACK_DEFAULT);
if (!stack->data){
return GUTHTHILA_FAILURE;
@@ -49,18 +49,18 @@
}
}
-void GUTHTHILA_CALL guththila_stack_free(guththila_stack_t *stack)
+void GUTHTHILA_CALL guththila_stack_free(guththila_stack_t *stack, axutil_env_t *env)
{
- if (stack->data) free (stack->data);
- free(stack);
+ if (stack->data) AXIS2_FREE (env->allocator, stack->data);
+ AXIS2_FREE(env->allocator, stack);
}
-void GUTHTHILA_CALL guththila_stack_free_data(guththila_stack_t *stack)
+void GUTHTHILA_CALL guththila_stack_un_init(guththila_stack_t *stack, axutil_env_t *env)
{
- if (stack->data) free (stack->data);
+ if (stack->data) AXIS2_FREE (env->allocator, stack->data);
}
-void * GUTHTHILA_CALL guththila_stack_pop(guththila_stack_t *stack)
+void * GUTHTHILA_CALL guththila_stack_pop(guththila_stack_t *stack, axutil_env_t *env)
{
if (stack->top > 0){
return stack->data[stack->top-- - 1];;
@@ -68,18 +68,25 @@
return NULL;
}
-int GUTHTHILA_CALL guththila_stack_push(guththila_stack_t *stack, void *data)
+int GUTHTHILA_CALL guththila_stack_push(guththila_stack_t *stack, void *data, axutil_env_t *env)
{
+ int i = 0;
+ void **temp = NULL;
if (stack->top >= stack->max) {
- stack->data = (void **) realloc(stack->data, sizeof(void **) * (stack->max += GUTHTHILA_STACK_DEFAULT));
-
+ /*stack->data = (void **) realloc(stack->data, sizeof(void **) * (stack->max += GUTHTHILA_STACK_DEFAULT));*/
+ temp = (void **) AXIS2_MALLOC(env->allocator, sizeof(void **) * (stack->max += GUTHTHILA_STACK_DEFAULT));
+ for (i = 0; i < stack->top; i++) {
+ temp[i] = stack->data[i];
+ }
+ AXIS2_FREE(env->allocator, stack->data);
+ stack->data = temp;
if (!stack->data) return GUTHTHILA_FAILURE;
}
stack->data[stack->top] = data;
return stack->top++;
}
-void * GUTHTHILA_CALL guththila_stack_peek(guththila_stack_t *stack)
+void * GUTHTHILA_CALL guththila_stack_peek(guththila_stack_t *stack, axutil_env_t *env)
{
if (stack->top > 0){
return stack->data[stack->top - 1];
@@ -88,21 +95,21 @@
}
}
-int GUTHTHILA_CALL guththila_stack_del_top(guththila_stack_t *stack)
+int GUTHTHILA_CALL guththila_stack_del_top(guththila_stack_t *stack, axutil_env_t *env)
{
if (stack->top > 0){
- free(stack->data[stack->top]);
+ AXIS2_FREE(env->allocator, stack->data[stack->top]);
return GUTHTHILA_SUCCESS;
}
return GUTHTHILA_FAILURE;
}
-int GUTHTHILA_CALL guththila_stack_is_empty(guththila_stack_t *stack)
+int GUTHTHILA_CALL guththila_stack_is_empty(guththila_stack_t *stack, axutil_env_t *env)
{
return stack->top == 0 ? 1 : 0;
}
-void * GUTHTHILA_CALL guththila_stack_get_by_index(guththila_stack_t *stack, int index)
+void * GUTHTHILA_CALL guththila_stack_get_by_index(guththila_stack_t *stack, int index, axutil_env_t *env)
{
return index < stack->top ? stack->data[index] : NULL;
}
Modified: webservices/axis2/trunk/c/guththila/src/guththila_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_token.c?view=diff&rev=550488&r1=550487&r2=550488
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_token.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_token.c Mon Jun 25 06:08:28 2007
@@ -20,25 +20,25 @@
#include <stdio.h>
#define TOK_LIST_FREE(tok_list) \
- (if (tok_list) {free(tok_list)})
+ (if (tok_list) {AXIS2_FREE(tok_list)})
#define TOK_LIST_SIZE(tok_list) (tok_list->size)
-guththila_tok_list_t * GUTHTHILA_CALL guththila_tok_list_create()
+guththila_tok_list_t * GUTHTHILA_CALL guththila_tok_list_create(axutil_env_t *env)
{
int i = 0;
- guththila_tok_list_t *tok_list = (guththila_tok_list_t *)malloc(sizeof(guththila_tok_list_t));
+ guththila_tok_list_t *tok_list = (guththila_tok_list_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_tok_list_t));
if (!tok_list) return NULL;
- tok_list->list = (guththila_token_t **)malloc(sizeof(guththila_token_t *) * GUTHTHILA_TOK_DEF_LIST_SIZE);
+ tok_list->list = (guththila_token_t **)AXIS2_MALLOC(env->allocator, sizeof(guththila_token_t *) * GUTHTHILA_TOK_DEF_LIST_SIZE);
- if (tok_list->list && guththila_stack_init(&tok_list->fr_stack)){
- tok_list->capacity = (int *)malloc(sizeof(int) * GUTHTHILA_TOK_DEF_LIST_SIZE);
+ if (tok_list->list && guththila_stack_init(&tok_list->fr_stack, env)){
+ tok_list->capacity = (int *)AXIS2_MALLOC(env->allocator, sizeof(int) * GUTHTHILA_TOK_DEF_LIST_SIZE);
if (tok_list->capacity) {
tok_list->no_list = GUTHTHILA_TOK_DEF_LIST_SIZE;
- tok_list->list[0] = (guththila_token_t *)malloc(sizeof(guththila_token_t ) * GUTHTHILA_TOK_DEF_SIZE);
+ tok_list->list[0] = (guththila_token_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_token_t ) * GUTHTHILA_TOK_DEF_SIZE);
for (i = 0;i < GUTHTHILA_TOK_DEF_SIZE; i++){
- guththila_stack_push(&tok_list->fr_stack, &tok_list->list[0][i]);
+ guththila_stack_push(&tok_list->fr_stack, &tok_list->list[0][i], env);
}
tok_list->capacity[0] = GUTHTHILA_TOK_DEF_SIZE;
tok_list->cur_list = 0;
@@ -46,11 +46,11 @@
return tok_list;
}
}
- free(tok_list);
+ AXIS2_FREE(env->allocator, tok_list);
return NULL;
}
-int GUTHTHILA_CALL guththila_tok_list_grow(guththila_tok_list_t *tok_list)
+int GUTHTHILA_CALL guththila_tok_list_grow(guththila_tok_list_t *tok_list, axutil_env_t *env)
{
int i = 0;
int cur = 0;
@@ -59,39 +59,39 @@
if (tok_list->cur_list < tok_list->no_list -1) {
cur = ++tok_list->cur_list;
cur_cap = tok_list->capacity[cur -1] * 2;
- tok_list->list[cur] = (guththila_token_t *)malloc(sizeof(guththila_token_t ) * cur_cap);
+ tok_list->list[cur] = (guththila_token_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_token_t ) * cur_cap);
for (i = 0;i < cur_cap; i++){
- guththila_stack_push(&tok_list->fr_stack, &tok_list->list[cur][i]);
+ guththila_stack_push(&tok_list->fr_stack, &tok_list->list[cur][i], env);
}
tok_list->capacity[cur] = cur_cap;
return GUTHTHILA_SUCCESS;
} else {
- list = (guththila_token_t **)malloc(sizeof(guththila_token_t *) * tok_list->no_list * 2);
+ list = (guththila_token_t **)AXIS2_MALLOC(env->allocator, sizeof(guththila_token_t *) * tok_list->no_list * 2);
if (list) {
for (i = 0; i <= tok_list->cur_list; i++) {
list[i] = tok_list->list[i];
}
tok_list->no_list = tok_list->no_list * 2;
- free(tok_list->list);
+ AXIS2_FREE(env->allocator, tok_list->list);
tok_list->list = list;
- guththila_tok_list_grow(tok_list);
+ guththila_tok_list_grow(tok_list, env);
}
}
return GUTHTHILA_FAILURE;
}
-int GUTHTHILA_CALL guththila_tok_list_init(guththila_tok_list_t *tok_list)
+int GUTHTHILA_CALL guththila_tok_list_init(guththila_tok_list_t *tok_list, axutil_env_t *env)
{
int i = 0;
- tok_list->list = (guththila_token_t **)malloc(sizeof(guththila_token_t *) * GUTHTHILA_TOK_DEF_LIST_SIZE);
+ tok_list->list = (guththila_token_t **)AXIS2_MALLOC(env->allocator, sizeof(guththila_token_t *) * GUTHTHILA_TOK_DEF_LIST_SIZE);
- if (tok_list->list && guththila_stack_init(&tok_list->fr_stack)){
- tok_list->capacity = (int *)malloc(sizeof(int) * GUTHTHILA_TOK_DEF_LIST_SIZE);
+ if (tok_list->list && guththila_stack_init(&tok_list->fr_stack, env)){
+ tok_list->capacity = (int *)AXIS2_MALLOC(env->allocator, sizeof(int) * GUTHTHILA_TOK_DEF_LIST_SIZE);
if (tok_list->capacity) {
tok_list->no_list = GUTHTHILA_TOK_DEF_LIST_SIZE;
- tok_list->list[0] = (guththila_token_t *)malloc(sizeof(guththila_token_t ) * GUTHTHILA_TOK_DEF_SIZE);
+ tok_list->list[0] = (guththila_token_t *)AXIS2_MALLOC(env->allocator, sizeof(guththila_token_t ) * GUTHTHILA_TOK_DEF_SIZE);
for (i = 0;i < GUTHTHILA_TOK_DEF_SIZE; i++){
- guththila_stack_push(&tok_list->fr_stack, &tok_list->list[0][i]);
+ guththila_stack_push(&tok_list->fr_stack, &tok_list->list[0][i], env);
}
tok_list->capacity[0] = GUTHTHILA_TOK_DEF_SIZE;
tok_list->cur_list = 0;
@@ -102,42 +102,42 @@
return GUTHTHILA_FAILURE;
}
-void GUTHTHILA_CALL guththila_tok_list_free(guththila_tok_list_t *tok_list)
+void GUTHTHILA_CALL guththila_tok_list_free(guththila_tok_list_t *tok_list, axutil_env_t *env)
{
int i = 0;
- guththila_stack_free_data(&tok_list->fr_stack);
+ guththila_stack_un_init(&tok_list->fr_stack, env);
for (; i <= tok_list->cur_list; i++) {
- free(tok_list->list[i]);
+ AXIS2_FREE(env->allocator, tok_list->list[i]);
}
- free(tok_list->list);
- free(tok_list);
+ AXIS2_FREE(env->allocator, tok_list->list);
+ AXIS2_FREE(env->allocator, tok_list);
}
-void GUTHTHILA_CALL guththila_tok_list_free_data(guththila_tok_list_t *tok_list)
+void GUTHTHILA_CALL guththila_tok_list_free_data(guththila_tok_list_t *tok_list, axutil_env_t *env)
{
int i = 0;
- guththila_stack_free_data(&tok_list->fr_stack);
+ guththila_stack_un_init(&tok_list->fr_stack, env);
for (; i <= tok_list->cur_list; i++) {
- free(tok_list->list[i]);
+ AXIS2_FREE(env->allocator, tok_list->list[i]);
}
- free(tok_list->list);
+ AXIS2_FREE(env->allocator, tok_list->list);
}
-guththila_token_t * GUTHTHILA_CALL guththila_tok_list_get_token(guththila_tok_list_t *tok_list)
+guththila_token_t * GUTHTHILA_CALL guththila_tok_list_get_token(guththila_tok_list_t *tok_list, axutil_env_t *env)
{
- if (tok_list->fr_stack.top > 0 || guththila_tok_list_grow(tok_list)){
- return guththila_stack_pop(&tok_list->fr_stack);
+ if (tok_list->fr_stack.top > 0 || guththila_tok_list_grow(tok_list, env)){
+ return guththila_stack_pop(&tok_list->fr_stack, env);
}
return NULL;
}
-int GUTHTHILA_CALL guththila_tok_list_release_token(guththila_tok_list_t *tok_list, guththila_token_t *token)
+int GUTHTHILA_CALL guththila_tok_list_release_token(guththila_tok_list_t *tok_list, guththila_token_t *token, axutil_env_t *env)
{
- return guththila_stack_push(&tok_list->fr_stack, token);
+ return guththila_stack_push(&tok_list->fr_stack, token, env);
}
-int GUTHTHILA_CALL guththila_tok_str_cmp(guththila_token_t *tok, char *str, size_t str_len)
+int GUTHTHILA_CALL guththila_tok_str_cmp(guththila_token_t *tok, char *str, size_t str_len, axutil_env_t *env)
{
unsigned int i = 0;
if (tok->size != str_len) return -1;
@@ -149,7 +149,7 @@
return 0;
}
-int GUTHTHILA_CALL guththila_tok_tok_cmp(guththila_token_t *tok1, guththila_token_t *tok2)
+int GUTHTHILA_CALL guththila_tok_tok_cmp(guththila_token_t *tok1, guththila_token_t *tok2, axutil_env_t *env)
{
unsigned int i = 0;
if (tok1->size != tok2->size) return -1;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org