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 2006/09/20 05:11:29 UTC
svn commit: r448042 [3/5] - in /webservices/axis2/trunk/c: axiom/src/om/
axiom/src/parser/guththila/ axiom/test/om/ guththila/samples/
guththila/src/ modules/core/addr/ modules/core/description/
modules/core/engine/ modules/core/transport/http/server/a...
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=448042&r1=448041&r2=448042
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_token.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_token.c Tue Sep 19 20:11:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
+ *
*/
@@ -24,30 +24,30 @@
AXIS2_EXTERN guththila_token_t *
-guththila_token_create_token_buffer (axis2_env_t *environment,
- int size)
+guththila_token_create_token_buffer(axis2_env_t *environment,
+ int size)
{
guththila_token_t *tok =
- (guththila_token_t *) AXIS2_MALLOC (environment->allocator,
- sizeof (guththila_token_t) * size);
+ (guththila_token_t *) AXIS2_MALLOC(environment->allocator,
+ sizeof(guththila_token_t) * size);
tok->size = size;
return tok;
}
AXIS2_EXTERN void
-guththila_token_free_token_buffer (axis2_env_t * environment,
- guththila_token_t * tok)
+guththila_token_free_token_buffer(axis2_env_t * environment,
+ guththila_token_t * tok)
{
if (tok)
- AXIS2_FREE (environment->allocator, tok);
+ AXIS2_FREE(environment->allocator, tok);
}
AXIS2_EXTERN void
-guththila_token_exception ()
+guththila_token_exception()
{
- printf ("Throws new token Exception");
+ printf("Throws new token Exception");
/* Samisa : we should define the error code and error desctioption and return error code to user
no use of using printf within a library
please delete this comment once this is fixed.
@@ -56,111 +56,111 @@
AXIS2_EXTERN int
-guththila_token_length (axis2_env_t * environment,
- guththila_token_t * tok)
+guththila_token_length(axis2_env_t * environment,
+ guththila_token_t * tok)
{
if (tok->end)
return (tok->end) - (tok->start) + 1;
else
- guththila_token_exception ();
+ guththila_token_exception();
return 0;
}
AXIS2_EXTERN guththila_token_t *
-guththila_token_grow (axis2_env_t * environment,
- guththila_token_t * tok)
+guththila_token_grow(axis2_env_t * environment,
+ guththila_token_t * tok)
{
tok->size <<= 1;
- tok = (guththila_token_t *) AXIS2_REALLOC (environment->allocator,
- tok, sizeof (guththila_token_t) * tok->size);
+ tok = (guththila_token_t *) AXIS2_REALLOC(environment->allocator,
+ tok, sizeof(guththila_token_t) * tok->size);
return tok;
}
AXIS2_EXTERN guththila_token_t *
-guththila_token_append (axis2_env_t * environment,
- guththila_token_t * tok)
+guththila_token_append(axis2_env_t * environment,
+ guththila_token_t * tok)
{
if (++(tok->last) > (tok->size))
- guththila_token_grow (environment, tok);
+ guththila_token_grow(environment, tok);
return &tok[tok->last];
}
AXIS2_EXTERN guththila_token_t *
-guththila_token_last (axis2_env_t * environment,
- guththila_token_t * tok)
+guththila_token_last(axis2_env_t * environment,
+ guththila_token_t * tok)
{
if (tok->last < 0)
- guththila_token_exception ();
+ guththila_token_exception();
return &tok[tok->last];
}
AXIS2_EXTERN int
-guththila_token_count (axis2_env_t * environment,
- guththila_token_t * tok)
+guththila_token_count(axis2_env_t * environment,
+ guththila_token_t * tok)
{
return tok->last;
}
AXIS2_EXTERN guththila_char_t *
-guththila_token_char_ref (axis2_env_t * environment,
- guththila_char_t * buffer)
+guththila_token_char_ref(axis2_env_t * environment,
+ guththila_char_t * buffer)
{
int len;
int ii;
int ix;
guththila_char_t *ref_buffer = NULL;
-
- len = AXIS2_STRLEN ( buffer);
- ref_buffer = (guththila_char_t *) AXIS2_MALLOC (
- environment->allocator, len + 1);
-
-
+
+ len = AXIS2_STRLEN(buffer);
+ ref_buffer = (guththila_char_t *) AXIS2_MALLOC(
+ environment->allocator, len + 1);
+
+
for (ii = 0, ix = 0; ii < len; ii++, ix++)
{
if (buffer[ii] == '&')
{
if (buffer[ii + 1] == 'a'
- && buffer[ii + 2] == 'm'
- && buffer[ii + 3] == 'p' && buffer[ii + 4] == ';')
+ && buffer[ii + 2] == 'm'
+ && buffer[ii + 3] == 'p' && buffer[ii + 4] == ';')
{
ref_buffer[ix] = '&';
ii += 4;
}
else if (buffer[ii + 1] == 'g'
- && buffer[ii + 2] == 't' && buffer[ii + 3] == ';')
+ && buffer[ii + 2] == 't' && buffer[ii + 3] == ';')
{
ref_buffer[ix] = '>';
ii += 3;
}
else if (buffer[ii + 1] == 'l'
- && buffer[ii + 2] == 't' && buffer[ii + 3] == ';')
+ && buffer[ii + 2] == 't' && buffer[ii + 3] == ';')
{
ref_buffer[ix] = '<';
ii += 3;
}
else if (buffer[ii + 1] == 'q'
- && buffer[ii + 2] == 'u'
- && buffer[ii + 3] == 'o'
- && buffer[ii + 4] == 't' && buffer[ii + 5] == ';')
+ && buffer[ii + 2] == 'u'
+ && buffer[ii + 3] == 'o'
+ && buffer[ii + 4] == 't' && buffer[ii + 5] == ';')
{
ref_buffer[ix] = '"';
ii += 5;
}
else if (buffer[ii + 1] == 'a'
- && buffer[ii + 2] == 'p'
- && buffer[ii + 3] == 'o'
- && buffer[ii + 4] == 's' && buffer[ii + 5] == ';')
+ && buffer[ii + 2] == 'p'
+ && buffer[ii + 3] == 'o'
+ && buffer[ii + 4] == 's' && buffer[ii + 5] == ';')
{
ref_buffer[ix] = '\'';
ii += 5;
}
else
- guththila_token_exception ();
+ guththila_token_exception();
}
else
ref_buffer[ix] = buffer[ii];
@@ -170,8 +170,8 @@
AXIS2_EXTERN guththila_char_t *
-guththila_token_to_string (axis2_env_t * environment,
- guththila_token_t * tok, int unicode)
+guththila_token_to_string(axis2_env_t * environment,
+ guththila_token_t * tok, int unicode)
{
if (tok)
{
@@ -179,13 +179,13 @@
{
int length;
guththila_char_t *buffer = NULL;
- length = guththila_token_length (environment, tok);
- buffer = (guththila_char_t *) AXIS2_MALLOC (environment->allocator,
- length + 1);
- memcpy (buffer, tok->start, length);
+ length = guththila_token_length(environment, tok);
+ buffer = (guththila_char_t *) AXIS2_MALLOC(environment->allocator,
+ length + 1);
+ memcpy(buffer, tok->start, length);
buffer[length] = 0;
if (tok->ref)
- return guththila_token_char_ref (environment, buffer);
+ return guththila_token_char_ref(environment, buffer);
else
return buffer;
}
@@ -193,25 +193,25 @@
{
int length;
guththila_char_t *buffer = NULL;
- length = guththila_token_length (environment, tok);
-
- buffer = (guththila_char_t *) AXIS2_MALLOC (
- environment->allocator, length + 1);
-
- memcpy (buffer, tok->start, length);
+ length = guththila_token_length(environment, tok);
+
+ buffer = (guththila_char_t *) AXIS2_MALLOC(
+ environment->allocator, length + 1);
+
+ memcpy(buffer, tok->start, length);
buffer[length] = 0;
- return guththila_token_convert_utf16_to_utf8 (environment, buffer,
- length);
+ return guththila_token_convert_utf16_to_utf8(environment, buffer,
+ length);
}
}
else
- return NULL;
+ return NULL;
}
AXIS2_EXTERN void
-guththila_token_relocate (axis2_env_t * environment,
- guththila_token_t * tok, int offset)
+guththila_token_relocate(axis2_env_t * environment,
+ guththila_token_t * tok, int offset)
{
tok->start -= offset;
tok->end -= offset;
@@ -219,24 +219,24 @@
AXIS2_EXTERN int
-guththila_token_compare (axis2_env_t * environment,
- guththila_token_t * tok, const guththila_char_t * s,
- int n, int unicode_state)
+guththila_token_compare(axis2_env_t * environment,
+ guththila_token_t * tok, const guththila_char_t * s,
+ int n, int unicode_state)
{
if (unicode_state == None)
- return strncmp (tok->start, s, n);
+ return strncmp(tok->start, s, n);
else
{
guththila_char_t *buffer = NULL;
- buffer = guththila_token_to_string (environment, tok, unicode_state);
- return strncmp (buffer, s, n);
+ buffer = guththila_token_to_string(environment, tok, unicode_state);
+ return strncmp(buffer, s, n);
}
}
AXIS2_EXTERN int
-guththila_token_length_utf16 (axis2_env_t * environment,
- unsigned int utf16_ch)
+guththila_token_length_utf16(axis2_env_t * environment,
+ unsigned int utf16_ch)
{
int length;
@@ -258,15 +258,15 @@
AXIS2_EXTERN guththila_char_t *
-guththila_token_build_utf8 (axis2_env_t * environment,
- unsigned int utf16_ch, int length)
+guththila_token_build_utf8(axis2_env_t * environment,
+ unsigned int utf16_ch, int length)
{
guththila_UTF8_char mask = 0;
int ii = 0;
guththila_char_t *buffer =
- (guththila_char_t *) AXIS2_MALLOC (environment->allocator,
- length + 1);
- memset (buffer, 0, length+1);
+ (guththila_char_t *) AXIS2_MALLOC(environment->allocator,
+ length + 1);
+ memset(buffer, 0, length + 1);
if (length == 1)
buffer[0] = utf16_ch;
@@ -274,23 +274,23 @@
{
switch (length)
{
- case 1:
- break;
- case 2:
- mask = 0xc0;
- break;
- case 3:
- mask = 0xe0;
- break;
- case 4:
- mask = 0xf0;
- break;
- case 5:
- mask = 0xf8;
- break;
- case 6:
- mask = 0xfc;
- break;
+ case 1:
+ break;
+ case 2:
+ mask = 0xc0;
+ break;
+ case 3:
+ mask = 0xe0;
+ break;
+ case 4:
+ mask = 0xf0;
+ break;
+ case 5:
+ mask = 0xf8;
+ break;
+ case 6:
+ mask = 0xfc;
+ break;
};
for (ii = length - 1; ii > 0; ii--)
@@ -307,8 +307,8 @@
AXIS2_EXTERN guththila_char_t *
-guththila_token_convert_utf16_to_utf8 (axis2_env_t * environment,
- guththila_char_t * buffer, int length)
+guththila_token_convert_utf16_to_utf8(axis2_env_t * environment,
+ guththila_char_t * buffer, int length)
{
unsigned int utf16_char = 0;
int length_utf16 = 0;
@@ -317,18 +317,18 @@
guththila_char_t *output_char = 0;
int ii = 0;
guththila_char_t *output_buffer =
- (guththila_char_t *) AXIS2_MALLOC (environment->allocator, 1);
- memset (output_buffer, 0, 1);
+ (guththila_char_t *) AXIS2_MALLOC(environment->allocator, 1);
+ memset(output_buffer, 0, 1);
for (ii = 0; length > ii;)
{
utf16_char = *((guththila_UTF16_char *) & input_buffer[ii]);
ii += 2;
- length_utf16 = guththila_token_length_utf16 (environment, utf16_char);
+ length_utf16 = guththila_token_length_utf16(environment, utf16_char);
output_char =
- guththila_token_build_utf8 (environment, utf16_char,
- length_utf16);
+ guththila_token_build_utf8(environment, utf16_char,
+ length_utf16);
total_length += length_utf16;
- output_buffer = strcat (output_buffer, output_char);
+ output_buffer = strcat(output_buffer, output_char);
}
return output_buffer;
}
Modified: webservices/axis2/trunk/c/guththila/src/guththila_unicode.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_unicode.c?view=diff&rev=448042&r1=448041&r2=448042
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_unicode.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_unicode.c Tue Sep 19 20:11:28 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
+ *
*/
@@ -22,11 +22,11 @@
#include <string.h>
#ifdef UNICODE_OUT /* This variable for Obtain UTF-16 Output */
-/*! In order to determine length of UTF-16 Buffer
+/*! In order to determine length of UTF-16 Buffer
* Basicall guththila_char_t *p should be a Utf-16 Buffer */
guththila_UTF8_char
-guththila_strlen_unicode (guththila_char_t * p)
+guththila_strlen_unicode(guththila_char_t * p)
{
guththila_UTF8_char len = 0;
guththila_UTF8_char d;
@@ -54,11 +54,11 @@
/*!To Duplicate UTF-16 String */
guththila_char_t *
-guththila_strdup_unicode (guththila_char_t * p, int length)
+guththila_strdup_unicode(guththila_char_t * p, int length)
{
guththila_char_t *s;
- s = (guththila_char_t *) calloc (length + 1, 1);
+ s = (guththila_char_t *) calloc(length + 1, 1);
s[length] = 0;
- return (guththila_char_t *) memcpy (s, p, length);
+ return (guththila_char_t *) memcpy(s, p, length);
}
#endif /*end of UNICODE_OUT definition */
Modified: webservices/axis2/trunk/c/guththila/src/guththila_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_writer.c?view=diff&rev=448042&r1=448041&r2=448042
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_writer.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_writer.c Tue Sep 19 20:11:28 2006
@@ -13,98 +13,98 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
+ *
*/
#include "guththila_writer.h"
AXIS2_EXTERN guththila_writer_t * AXIS2_CALL
-guththila_writer_create_for_file (axis2_env_t *env, char *fp)
+guththila_writer_create_for_file(axis2_env_t *env, char *fp)
{
- guththila_writer_impl_t *wt = NULL;
- if(!fp)
+ guththila_writer_impl_t *wt = NULL;
+ if (!fp)
return NULL;
- wt = (guththila_writer_impl_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_writer_impl_t));
- wt->outputstream = fopen (fp, "w");
- if (!wt->outputstream)
+ wt = (guththila_writer_impl_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_writer_impl_t));
+ wt->outputstream = fopen(fp, "w");
+ if (!wt->outputstream)
return NULL;
- wt->writer.guththila_writer_type = GUTHTHILA_WRITER_FILE;
+ wt->writer.guththila_writer_type = GUTHTHILA_WRITER_FILE;
return &(wt->writer);
}
AXIS2_EXTERN guththila_writer_t * AXIS2_CALL
-guththila_writer_create_for_memory (axis2_env_t *env)
+guththila_writer_create_for_memory(axis2_env_t *env)
{
- guththila_writer_impl_t *wt = NULL;
+ guththila_writer_impl_t *wt = NULL;
- wt = (guththila_writer_impl_t *) AXIS2_MALLOC (env->allocator, sizeof (guththila_writer_impl_t));
- wt->outputstream = NULL;
+ wt = (guththila_writer_impl_t *) AXIS2_MALLOC(env->allocator, sizeof(guththila_writer_impl_t));
+ wt->outputstream = NULL;
- wt->buffer = guththila_buffer_create (env, 1024);
- memset ((void *)wt->buffer->buff, 0, 1024);
- if (!wt->buffer)
- return NULL;
-
- wt->writer.guththila_writer_type = GUTHTHILA_WRITER_MEMORY;
- return &(wt->writer);
+ wt->buffer = guththila_buffer_create(env, 1024);
+ memset((void *)wt->buffer->buff, 0, 1024);
+ if (!wt->buffer)
+ return NULL;
+
+ wt->writer.guththila_writer_type = GUTHTHILA_WRITER_MEMORY;
+ return &(wt->writer);
}
AXIS2_EXTERN void AXIS2_CALL
-guththila_writer_free (axis2_env_t *env, guththila_writer_t *wt)
+guththila_writer_free(axis2_env_t *env, guththila_writer_t *wt)
{
- if (wt)
+ if (wt)
{
- if (wt->guththila_writer_type == GUTHTHILA_WRITER_FILE)
- {
- if (((guththila_writer_impl_t *)wt)->outputstream)
- fclose (((guththila_writer_impl_t *)wt)->outputstream);
- ((guththila_writer_impl_t *)wt)->outputstream = NULL;
- }
- AXIS2_FREE (env->allocator, (guththila_writer_t *)wt);
- wt = NULL;
+ if (wt->guththila_writer_type == GUTHTHILA_WRITER_FILE)
+ {
+ if (((guththila_writer_impl_t *)wt)->outputstream)
+ fclose(((guththila_writer_impl_t *)wt)->outputstream);
+ ((guththila_writer_impl_t *)wt)->outputstream = NULL;
+ }
+ AXIS2_FREE(env->allocator, (guththila_writer_t *)wt);
+ wt = NULL;
}
}
AXIS2_EXTERN int AXIS2_CALL
-guththila_writer_write (axis2_env_t *env,
- char *buffer, int offset,
- int length, guththila_writer_t *wt)
+guththila_writer_write(axis2_env_t *env,
+ char *buffer, int offset,
+ int length, guththila_writer_t *wt)
{
- int c = 0;
- guththila_writer_impl_t *writer_impl = NULL;
+ int c = 0;
+ guththila_writer_impl_t *writer_impl = NULL;
if (wt->guththila_writer_type == GUTHTHILA_WRITER_FILE)
{
- c = fwrite (buffer+offset, 1, length, ((guththila_writer_impl_t *)wt)->outputstream);
+ c = fwrite(buffer + offset, 1, length, ((guththila_writer_impl_t *)wt)->outputstream);
}
else if (wt->guththila_writer_type == GUTHTHILA_WRITER_MEMORY)
- {
- int size = 0;
- writer_impl = (guththila_writer_impl_t *)wt;
-
- if (writer_impl->buffer->buff)
- size = strlen ((const char *)writer_impl->buffer->buff);
-
- if ((size + length) > writer_impl->buffer->size)
- {
- writer_impl->buffer = guththila_buffer_grow (env, writer_impl->buffer);
- }
- strcat (writer_impl->buffer->buff, buffer);
- c = length;
- }
+ {
+ int size = 0;
+ writer_impl = (guththila_writer_impl_t *)wt;
+
+ if (writer_impl->buffer->buff)
+ size = strlen((const char *)writer_impl->buffer->buff);
+
+ if ((size + length) > writer_impl->buffer->size)
+ {
+ writer_impl->buffer = guththila_buffer_grow(env, writer_impl->buffer);
+ }
+ strcat(writer_impl->buffer->buff, buffer);
+ c = length;
+ }
return c;
}
AXIS2_EXTERN char * AXIS2_CALL
-guththila_writer_get_buffer (axis2_env_t *env,
- guththila_writer_t *wt)
+guththila_writer_get_buffer(axis2_env_t *env,
+ guththila_writer_t *wt)
{
- guththila_writer_impl_t *writer_impl = NULL;
- writer_impl = (guththila_writer_impl_t *)wt;
-
- if (writer_impl->buffer->buff)
- return (char *)writer_impl->buffer->buff;
- else
- return (char *)NULL;
+ guththila_writer_impl_t *writer_impl = NULL;
+ writer_impl = (guththila_writer_impl_t *)wt;
+
+ if (writer_impl->buffer->buff)
+ return (char *)writer_impl->buffer->buff;
+ else
+ return (char *)NULL;
}
Modified: webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c?view=diff&rev=448042&r1=448041&r2=448042
==============================================================================
--- webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c (original)
+++ webservices/axis2/trunk/c/guththila/src/guththila_writer_main.c Tue Sep 19 20:11:28 2006
@@ -2,31 +2,31 @@
#include <guththila_buffer.h>
#include <guththila_reader.h>
#include <guththila.h>
-int main ()
+int main()
{
- axis2_allocator_t *allocator = axis2_allocator_init (NULL);
- axis2_env_t *env = axis2_env_create (allocator);
- guththila_t *parser = guththila_create (env, NULL);
- guththila_create_xml_stream_writer (env, parser, "w.xml");
- guththila_write_start_document (env, parser);
- guththila_write_start_element (env, parser, "person");
- guththila_write_start_element (env, parser, "name");
- guththila_write_characters (env, parser, "guththila");
- guththila_write_start_element (env, parser, "escape");
- guththila_write_escape_character (env, parser, "&");
- guththila_write_escape_character (env, parser, ">");
- guththila_write_end_element (env, parser);
- guththila_write_start_element (env, parser, "escape");
- guththila_write_default_namespace (env, parser, "http://www.cse.mrt.ac.lk");
- guththila_write_namespace (env, parser, "a", "http://ws.apache.org");
- guththila_write_attribute_with_prefix(env, parser, "a", "web", "false");
- guththila_write_start_element (env, parser, "one");
- guththila_write_start_element_with_prefix (env, parser, "a", "two");
- guththila_write_characters (env, parser, "it works !");
- guththila_write_end_document (env, parser);
- guththila_xml_writer_free (env, parser);
- guththila_free (env, parser);
- axis2_allocator_free (allocator);
- axis2_env_free (env);
- return 0;
+ axis2_allocator_t *allocator = axis2_allocator_init(NULL);
+ axis2_env_t *env = axis2_env_create(allocator);
+ guththila_t *parser = guththila_create(env, NULL);
+ guththila_create_xml_stream_writer(env, parser, "w.xml");
+ guththila_write_start_document(env, parser);
+ guththila_write_start_element(env, parser, "person");
+ guththila_write_start_element(env, parser, "name");
+ guththila_write_characters(env, parser, "guththila");
+ guththila_write_start_element(env, parser, "escape");
+ guththila_write_escape_character(env, parser, "&");
+ guththila_write_escape_character(env, parser, ">");
+ guththila_write_end_element(env, parser);
+ guththila_write_start_element(env, parser, "escape");
+ guththila_write_default_namespace(env, parser, "http://www.cse.mrt.ac.lk");
+ guththila_write_namespace(env, parser, "a", "http://ws.apache.org");
+ guththila_write_attribute_with_prefix(env, parser, "a", "web", "false");
+ guththila_write_start_element(env, parser, "one");
+ guththila_write_start_element_with_prefix(env, parser, "a", "two");
+ guththila_write_characters(env, parser, "it works !");
+ guththila_write_end_document(env, parser);
+ guththila_xml_writer_free(env, parser);
+ guththila_free(env, parser);
+ axis2_allocator_free(allocator);
+ axis2_env_free(env);
+ return 0;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org