You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by na...@apache.org on 2006/09/27 15:07:29 UTC
svn commit: r450427 [4/4] - in /webservices/axis2/trunk/c/tools/codegen/src:
./ schema/ templates/ typemappers/ wsdl/ wsdl/emitter/ wsdl/extensions/
wsdl/writer/
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_code_indenter_ext.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <w2c_extension.h>
#include <w2c_string.h>
#include <axis2_string.h>
@@ -23,19 +23,18 @@
{
w2c_extension_t extension;
-}
-w2c_c_code_indenter_ext_impl_t;
+} w2c_c_code_indenter_ext_impl_t;
#define W2C_INTF_TO_IMPL(extension) \
((w2c_c_code_indenter_ext_impl_t*) extension)
-void format_file(axis2_char_t *filename,
- const axis2_env_t *env);
+void format_file( axis2_char_t *filename,
+ const axis2_env_t *env);
/************************* implmentations ********************************/
axis2_status_t AXIS2_CALL
w2c_c_code_indenter_ext_free(w2c_extension_t *extension,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_c_code_indenter_ext_impl_t *extension_impl = NULL;
@@ -43,11 +42,11 @@
extension_impl = W2C_INTF_TO_IMPL(extension);
- if (extension->ops)
+ if(extension->ops)
{
AXIS2_FREE(env->allocator, extension->ops);
}
- if (extension_impl)
+ if(extension_impl)
{
AXIS2_FREE(env->allocator, extension_impl);
}
@@ -57,8 +56,8 @@
axis2_status_t AXIS2_CALL
w2c_c_code_indenter_ext_engage(w2c_extension_t *extension,
- const axis2_env_t *env,
- w2c_engine_configuration_t *conf)
+ const axis2_env_t *env,
+ w2c_engine_configuration_t *conf)
{
w2c_c_code_indenter_ext_impl_t *extension_impl = NULL;
axis2_bool_t indent_code = AXIS2_FALSE;
@@ -67,27 +66,27 @@
int i = 0, size = 0;
axis2_char_t *filename = NULL;
int length = 0;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
extension_impl = W2C_INTF_TO_IMPL(extension);
- indent_code = W2C_ENGINE_CONFIGURATION_GET_INDENT_CODE(conf, env);
- lang = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE(conf, env);
- filenames = W2C_ENGINE_CONFIGURATION_GET_FILENAMES(conf, env);
+ indent_code = W2C_ENGINE_CONFIGURATION_GET_INDENT_CODE( conf, env);
+ lang = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE( conf, env);
+ filenames = W2C_ENGINE_CONFIGURATION_GET_FILENAMES( conf, env);
/* this executes only with following configuration */
- if (indent_code && AXIS2_STRCMP(lang, "c") == 0)
+ if ( indent_code && AXIS2_STRCMP( lang, "c") == 0)
{
- size = AXIS2_ARRAY_LIST_SIZE(filenames, env);
- for (i = 0; i < size; i ++)
+ size = AXIS2_ARRAY_LIST_SIZE( filenames, env);
+ for ( i = 0; i < size; i ++ )
{
- filename = AXIS2_ARRAY_LIST_GET(filenames, env, i);
- length = AXIS2_STRLEN(filename);
+ filename = AXIS2_ARRAY_LIST_GET( filenames, env, i);
+ length = AXIS2_STRLEN( filename);
/* take only .c or .h files */
- if (filename[length-1] == 'c' || filename[length-1] == 'h' ||
- filename[length-2] == '.')
+ if( filename[length-1] == 'c' || filename[length-1] == 'h' ||
+ filename[length-2] == '.' )
{
- format_file(filename, env);
+ format_file( filename, env);
}
}
}
@@ -97,32 +96,32 @@
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_extension_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_c_code_indenter_ext_impl_t *extension_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- extension_impl = (w2c_c_code_indenter_ext_impl_t*)AXIS2_MALLOC(env-> allocator,
- sizeof(w2c_c_code_indenter_ext_impl_t));
-
- if (NULL == extension_impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ extension_impl = (w2c_c_code_indenter_ext_impl_t*)AXIS2_MALLOC( env-> allocator,
+ sizeof(w2c_c_code_indenter_ext_impl_t) );
+
+ if(NULL == extension_impl)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
-
- extension_impl->extension.ops =
- AXIS2_MALLOC(env->allocator, sizeof(w2c_extension_ops_t));
- if (NULL == extension_impl->extension.ops)
+
+ extension_impl->extension.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(w2c_extension_ops_t));
+ if(NULL == extension_impl->extension.ops)
{
w2c_c_code_indenter_ext_free(&(extension_impl->extension), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
- }
- extension_impl->extension.ops->free =
- w2c_c_code_indenter_ext_free;
- extension_impl->extension.ops->engage =
- w2c_c_code_indenter_ext_engage;
+ }
+ extension_impl->extension.ops->free =
+ w2c_c_code_indenter_ext_free;
+ extension_impl->extension.ops->engage =
+ w2c_c_code_indenter_ext_engage;
*inst = &(extension_impl->extension);
@@ -131,11 +130,11 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_extension_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
if (inst)
{
status = W2C_EXTENSION_FREE(inst, env);
@@ -146,36 +145,35 @@
/** the following part seperated to handle code indenting algorithm */
/* function declarations */
-void format_file(axis2_char_t *filename,
- const axis2_env_t *env);
-axis2_char_t* read_file(axis2_char_t *filename,
- const axis2_env_t *env);
-void write_file(axis2_char_t *filename,
- axis2_char_t *buffer,
- const axis2_env_t *env);
+void format_file( axis2_char_t *filename,
+ const axis2_env_t *env);
+axis2_char_t* read_file ( axis2_char_t *filename,
+ const axis2_env_t *env);
+void write_file ( axis2_char_t *filename,
+ axis2_char_t *buffer,
+ const axis2_env_t *env);
typedef struct custom_allocator
{
- int allocated;
- int index;
- char* buffer;
-}
-custom_allocator_t;
-
-void add_string(const axis2_env_t* env,
- custom_allocator_t* allocator,
- char* string);
-
-void add_char(const axis2_env_t* env,
- custom_allocator_t* allocator,
- char c,
- int turns);
+ int allocated;
+ int index;
+ char* buffer;
+} custom_allocator_t;
+
+void add_string( const axis2_env_t* env,
+ custom_allocator_t* allocator,
+ char* string);
+
+void add_char( const axis2_env_t* env,
+ custom_allocator_t* allocator,
+ char c,
+ int turns);
#define SPACES_FOR_TAB 4
/* implementations */
-void format_file(axis2_char_t *filename,
- const axis2_env_t *env)
+void format_file( axis2_char_t *filename,
+ const axis2_env_t *env)
{
custom_allocator_t * allocator = NULL;
axis2_char_t* in_buffer = NULL;
@@ -192,6 +190,7 @@
int line_ended_with_semicolon = 1;
int line_ended_with_bracket = 0;
int line_ended_with_backslash = 0;
+ int line_ended_with_curly_bracket = 0; /* close} or open{ */
int tabs_off = 0;
int is_comment = 0;
int multi_line_comment = 0;
@@ -199,190 +198,205 @@
int early_line_blank = 0;
int comment_just_finished = 0;
int early_line_macro = 0;
-
+
allocator = (custom_allocator_t*) AXIS2_MALLOC(env->
- allocator, sizeof(custom_allocator_t));
+ allocator, sizeof(custom_allocator_t));
allocator-> buffer = NULL;
allocator-> allocated = 0;
allocator-> index = 0;
-
- in_buffer = read_file(filename, env);
+
+ in_buffer = read_file( filename, env);
p = in_buffer;
- for (p = in_buffer, tabs = 0 ; *p ; p ++)
+ for ( p = in_buffer, tabs = 0 ; *p ; p ++)
{
/** identify new_line */
- if (p == in_buffer || *(p - 1) == '\n')
+ if ( p == in_buffer || *(p-1) == '\n')
{
/* assign new tabs off value from previous lines */
tabs += tabs_off;
- if (tabs < 0) tabs = 0;
+ if (tabs < 0 ) tabs = 0;
tabs_off = 0;
/** some decision making) */
- if (!early_line_blank)
+ if ( !early_line_blank)
{
- if (line_ended_with_semicolon)
+ if ( line_ended_with_semicolon )
{
continue_from_early_line = 0;
}
- else if (line_ended_with_bracket)
+ else if ( line_ended_with_bracket)
{
continue_from_early_line = 0;
}
- else if (line_ended_with_backslash)
+ else if ( line_ended_with_curly_bracket)
+ {
+ continue_from_early_line = 0;
+ }
+ else if ( line_ended_with_backslash)
{
continue_from_early_line = 1;
}
else
{
- /** some decision
+ /** some decision
* if it is not a semicolon or bracket it continues*/
continue_from_early_line = 1;
}
-
+
/* more adjusment */
- if (comment_just_finished)
+ if ( comment_just_finished)
{
continue_from_early_line = 0;
}
- if (multi_line_comment)
+ if ( multi_line_comment)
{
continue_from_early_line = 1;
}
- if (early_line_macro && !line_ended_with_backslash)
+ if ( early_line_macro && !line_ended_with_backslash )
{
continue_from_early_line = 0;
}
}
+ else
+ {
+ /** big decision */
+ continue_from_early_line = 0;
+ }
start_blanks = 0;
/* count starter blanks */
- for (; *p && (*p == ' ' || *p == '\t'); p ++)
+ for( ; *p && (*p == ' ' || *p == '\t'); p ++)
{
start_blanks ++;
}
line_start = p;
- line_end = line_start;
- /** ommit things until the end */
- for (; *p && *p != '\n'; p ++)
+ line_end = NULL;
+ /** omit things until the end */
+ for( ; *p && *p !='\n'; p ++)
{
/** following set handle comments */
- if (!is_comment && *p == '/' &&
- *(p + 1) == '*')
+ if ( !is_comment && *p == '/' &&
+ *(p+1) == '*')
{
is_comment = 1;
multi_line_comment = 1;
}
- else if (is_comment && *p == '*' && *(p + 1) == '/')
+ else if ( is_comment && *p == '*' && *(p+1) == '/' )
{
is_comment = 0;
multi_line_comment = 0;
}
- else if (!is_comment && *p == '/' && *(p + 1) == '/')
+ else if ( !is_comment && *p == '/' && *(p+1) == '/' )
{
is_comment = 1;
}
- else if (!is_comment && *p == '{')
+ /* intending */
+ else if ( !is_comment && *p == '{' )
{
tabs_off ++;
}
- else if (!is_comment && *p == '}')
+ else if ( !is_comment && *p == '}')
{
tabs --;
- if (tabs < 0) tabs = 0;
+ if (tabs < 0 ) tabs = 0;
}
/** check for the valid end */
- if (!is_comment && *p != ' ')
+ if ( *p != ' ' && *p!='\t')
{
line_end = p;
}
}
*p = '\0';
- if (line_end != line_start)
+ if ( line_end )
{
- line_ended_with_semicolon = (';' == *line_end);
+ line_ended_with_semicolon = ( ';' == *line_end );
line_ended_with_bracket = (')' == *line_end);
- line_ended_with_backslash = ('\\' == *line_end);
- comment_just_finished = ('/' == *line_end &&
- line_end - 1 != line_start &&
- '*' == *(line_end - 1));
+ line_ended_with_backslash= ( '\\' == *line_end);
+ comment_just_finished = ( '/' == *line_end &&
+ line_end -1 != line_start &&
+ '*' == *(line_end-1) );
+ line_ended_with_curly_bracket = ( ('{' == *line_end)
+ || ('}' == *line_end) );
}
early_line_blank = ('\0' == *line_start);
early_line_macro = ('#' == *line_start);
-
- if (!multi_line_comment)
+
+ if( !multi_line_comment)
{
is_comment = 0;
}
- /* the following works only for generated code
+ /* the following works only for generated code
* given that code is relatively well formatted
*/
- if (continue_from_early_line)
+ if ( continue_from_early_line)
{
shift = start_blanks - early_line_start_blanks;
if (shift > 0)
- {
- add_char(env, allocator, ' ', shift);
+ {
+ add_char ( env, allocator, ' ', shift);
}
}
- else
+ else if(!early_line_blank)
{
early_line_start_blanks = start_blanks;
}
- if (tabs > 0)
+ if ( !continue_from_early_line)
{
- add_char(env, allocator, ' ', tabs * SPACES_FOR_TAB);
+ start_blanks = 0;
}
- add_string(env, allocator, line_start);
- add_char(env, allocator, '\n', 1);
+
+ if ( tabs > 0 )
+ {
+ add_char ( env, allocator, ' ', tabs * SPACES_FOR_TAB );
+ }
+ add_string ( env, allocator, line_start);
+ add_char (env, allocator, '\n', 1);
*p = '\n';
}
}
- *(allocator-> buffer + allocator-> index) = '\0';
- out_buffer = allocator-> buffer;
- write_file(filename, out_buffer, env);
+ *(allocator-> buffer + allocator-> index) = '\0';
+ out_buffer = allocator-> buffer;
+ write_file( filename, out_buffer, env);
}
-axis2_char_t* read_file(axis2_char_t *filename,
- const axis2_env_t *env)
+axis2_char_t* read_file ( axis2_char_t *filename,
+ const axis2_env_t *env)
{
- const int MAX_SIZE = 100;
+ const int MAX_SIZE=100;
int nread = 0;
FILE *f = NULL;
axis2_char_t *out_stream = NULL;
int ncount = 0;
- out_stream = (axis2_char_t*) AXIS2_MALLOC(env-> allocator,
- sizeof(axis2_char_t) * MAX_SIZE);
- if (out_stream == NULL)
+ out_stream = (axis2_char_t*) AXIS2_MALLOC( env-> allocator,
+ sizeof(axis2_char_t)* MAX_SIZE );
+ if (out_stream == NULL )
{
return NULL;
}
- f = fopen(filename, "r+");
- if (f == NULL)
+ f = fopen ( filename, "r+");
+ if ( f == NULL )
{
- free(out_stream);
+ free (out_stream );
return NULL;
}
- do
- {
- nread = fread(out_stream + ncount, sizeof(axis2_char_t), MAX_SIZE, f);
+ do{
+ nread = fread ( out_stream + ncount, sizeof(axis2_char_t), MAX_SIZE, f);
ncount += nread;
- out_stream = (axis2_char_t*) AXIS2_REALLOC(env-> allocator,
- out_stream,
- sizeof(axis2_char_t) * (MAX_SIZE + ncount));
- if (out_stream == NULL)
+ out_stream = (axis2_char_t*) AXIS2_REALLOC( env-> allocator,
+ out_stream,
+ sizeof(axis2_char_t)* (MAX_SIZE + ncount ) );
+ if ( out_stream == NULL )
{
return NULL;
}
- }
- while (nread == MAX_SIZE);
+ }while ( nread == MAX_SIZE );
out_stream[ncount] = '\0';
fclose(f);
@@ -390,37 +404,37 @@
return out_stream;
}
-void write_file(axis2_char_t *filename,
- axis2_char_t *buffer,
- const axis2_env_t *env)
+void write_file ( axis2_char_t *filename,
+ axis2_char_t *buffer,
+ const axis2_env_t *env)
{
FILE *f = NULL;
- f = fopen(filename, "w+");
- fprintf(f, "%s", buffer);
+ f = fopen( filename, "w+");
+ fprintf( f, "%s",buffer);
}
-void add_string(const axis2_env_t* env,
- custom_allocator_t* allocator,
- char* string)
+void add_string( const axis2_env_t* env,
+ custom_allocator_t* allocator,
+ char* string)
{
int additional_len = 0;
void* dest = NULL;
void* src = NULL;
int count = 0;
- additional_len = AXIS2_STRLEN(string) + 1;
- if (allocator-> index + additional_len >= allocator-> allocated)
+ additional_len = AXIS2_STRLEN ( string ) +1;
+ if ( allocator-> index + additional_len >= allocator-> allocated )
{
- if (allocator-> allocated == 0)
+ if ( allocator-> allocated == 0 )
{
allocator-> buffer =
- AXIS2_MALLOC(env-> allocator, additional_len);
+ AXIS2_MALLOC ( env-> allocator, additional_len );
}
else
{
allocator-> buffer =
- AXIS2_REALLOC(env-> allocator, allocator-> buffer,
- allocator-> allocated + additional_len);
+ AXIS2_REALLOC ( env-> allocator, allocator-> buffer,
+ allocator-> allocated + additional_len);
}
allocator-> allocated += additional_len;
}
@@ -429,38 +443,38 @@
dest = allocator-> buffer + allocator-> index;
src = string;
count = additional_len; /* this is with the terminating zero */
- memcpy(dest, src, count);
+ memcpy ( dest, src, count );
- allocator-> index += count - 1;
+ allocator-> index += count -1;
}
-void add_char(const axis2_env_t* env,
- custom_allocator_t* allocator,
- char c,
- int turns)
+void add_char( const axis2_env_t* env,
+ custom_allocator_t* allocator,
+ char c,
+ int turns)
{
int additional_len = 0;
additional_len = turns + 1;
- if (allocator-> index + additional_len >= allocator-> allocated)
+ if ( allocator-> index + additional_len >= allocator-> allocated )
{
- if (allocator-> allocated == 0)
+ if ( allocator-> allocated == 0 )
{
allocator-> buffer =
- AXIS2_MALLOC(env-> allocator, additional_len);
+ AXIS2_MALLOC ( env-> allocator, additional_len );
}
else
{
allocator-> buffer =
- AXIS2_REALLOC(env-> allocator, allocator-> buffer,
- allocator-> allocated + additional_len);
+ AXIS2_REALLOC ( env-> allocator, allocator-> buffer,
+ allocator-> allocated + additional_len);
}
allocator-> allocated += additional_len;
}
/* copy memory */
- memset(allocator-> buffer + allocator-> index, c, turns);
+ memset ( allocator-> buffer + allocator-> index, c, turns );
allocator-> index += turns;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_namemaker_ext.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <w2c_extension.h>
#include <w2c_string.h>
#include <axis2_string.h>
@@ -23,8 +23,7 @@
{
w2c_extension_t extension;
-}
-w2c_c_namemaker_ext_impl_t;
+} w2c_c_namemaker_ext_impl_t;
#define W2C_INTF_TO_IMPL(extension) \
((w2c_c_namemaker_ext_impl_t*) extension)
@@ -32,7 +31,7 @@
/************************* implmentations ********************************/
axis2_status_t AXIS2_CALL
w2c_c_namemaker_ext_free(w2c_extension_t *extension,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_c_namemaker_ext_impl_t *extension_impl = NULL;
@@ -40,11 +39,11 @@
extension_impl = W2C_INTF_TO_IMPL(extension);
- if (extension->ops)
+ if(extension->ops)
{
AXIS2_FREE(env->allocator, extension->ops);
}
- if (extension_impl)
+ if(extension_impl)
{
AXIS2_FREE(env->allocator, extension_impl);
}
@@ -54,58 +53,58 @@
axis2_status_t AXIS2_CALL
w2c_c_namemaker_ext_engage(w2c_extension_t *extension,
- const axis2_env_t *env,
- w2c_engine_configuration_t *conf)
+ const axis2_env_t *env,
+ w2c_engine_configuration_t *conf)
{
w2c_c_namemaker_ext_impl_t *extension_impl = NULL;
axis2_bool_t convert_names = AXIS2_FALSE;
axis2_char_t *lang = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
extension_impl = W2C_INTF_TO_IMPL(extension);
- convert_names = W2C_ENGINE_CONFIGURATION_GET_CONVERT_NAMES(conf, env);
- lang = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE(conf, env);
+ convert_names = W2C_ENGINE_CONFIGURATION_GET_CONVERT_NAMES( conf, env);
+ lang = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE( conf, env);
/* this executes only with following configuration */
- if (convert_names && AXIS2_STRCMP(lang, "c") == 0)
+ if ( convert_names && AXIS2_STRCMP( lang, "c") == 0)
{
- W2C_ENGINE_CONFIGURATION_SET_NAMEMAKER_FUNC(conf, env,
- (W2C_ENGINE_CONFIGURATION_NAMEMAKER) w2c_string_make_c_simple_name);
+ W2C_ENGINE_CONFIGURATION_SET_NAMEMAKER_FUNC( conf, env,
+ (W2C_ENGINE_CONFIGURATION_NAMEMAKER) w2c_string_make_c_simple_name);
}
-
+
return AXIS2_SUCCESS;
}
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_extension_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_c_namemaker_ext_impl_t *extension_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- extension_impl = (w2c_c_namemaker_ext_impl_t*)AXIS2_MALLOC(env-> allocator,
- sizeof(w2c_c_namemaker_ext_impl_t));
-
- if (NULL == extension_impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ extension_impl = (w2c_c_namemaker_ext_impl_t*)AXIS2_MALLOC( env-> allocator,
+ sizeof(w2c_c_namemaker_ext_impl_t) );
+
+ if(NULL == extension_impl)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
-
- extension_impl->extension.ops =
- AXIS2_MALLOC(env->allocator, sizeof(w2c_extension_ops_t));
- if (NULL == extension_impl->extension.ops)
+
+ extension_impl->extension.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(w2c_extension_ops_t));
+ if(NULL == extension_impl->extension.ops)
{
w2c_c_namemaker_ext_free(&(extension_impl->extension), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
- }
- extension_impl->extension.ops->free =
- w2c_c_namemaker_ext_free;
- extension_impl->extension.ops->engage =
- w2c_c_namemaker_ext_engage;
+ }
+ extension_impl->extension.ops->free =
+ w2c_c_namemaker_ext_free;
+ extension_impl->extension.ops->engage =
+ w2c_c_namemaker_ext_engage;
*inst = &(extension_impl->extension);
@@ -114,11 +113,11 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_extension_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
if (inst)
{
status = W2C_EXTENSION_FREE(inst, env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/c_qname2name_ext.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <w2c_extension.h>
#include <w2c_string.h>
#include <w2c_qname2name_maker.h>
@@ -27,8 +27,7 @@
axis2_hash_t *qname2name;
axis2_hash_t *name2number;
-}
-w2c_c_qname2name_ext_impl_t;
+} w2c_c_qname2name_ext_impl_t;
#define W2C_EXTENSION_INTF_TO_IMPL(extension) \
((w2c_c_qname2name_ext_impl_t*) extension)
@@ -39,11 +38,11 @@
/**************implmentations for w2c_extension_t methods**********************/
axis2_status_t AXIS2_CALL
w2c_c_qname2name_ext_free(w2c_extension_t *extension,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_c_qname2name_ext_impl_t *impl = NULL;
axis2_char_t *key = NULL;
- axis2_char_t *value = NULL;
+ axis2_char_t *value =NULL;
axis2_hash_index_t *hi = NULL;
axis2_hash_t *h = NULL;
@@ -52,30 +51,30 @@
impl = W2C_EXTENSION_INTF_TO_IMPL(extension);
h = impl-> qname2name;
-
+
for (hi = axis2_hash_first(h, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ hi; hi = axis2_hash_next(env, hi))
{
axis2_hash_this(hi, (void*)&key, NULL, (void*)&value);
if (key)
- AXIS2_FREE(env-> allocator, key);
+ AXIS2_FREE( env-> allocator, key);
if (value)
- AXIS2_FREE(env-> allocator, value);
+ AXIS2_FREE( env-> allocator, value);
}
- axis2_hash_free(h , env);
-
- axis2_hash_free(impl-> name2number, env);
+ axis2_hash_free( h , env);
+
+ axis2_hash_free( impl-> name2number, env);
- if (extension->ops)
+ if(extension->ops)
{
AXIS2_FREE(env->allocator, extension->ops);
}
- if ((&impl->qname2name_maker)->ops)
+ if((&impl->qname2name_maker)->ops)
{
- AXIS2_FREE(env->allocator,
+ AXIS2_FREE(env->allocator,
(&impl->qname2name_maker)->ops);
}
- if (impl)
+ if(impl)
{
AXIS2_FREE(env->allocator, impl);
}
@@ -85,26 +84,26 @@
axis2_status_t AXIS2_CALL
w2c_c_qname2name_ext_engage(w2c_extension_t *extension,
- const axis2_env_t *env,
- w2c_engine_configuration_t *conf)
+ const axis2_env_t *env,
+ w2c_engine_configuration_t *conf)
{
w2c_c_qname2name_ext_impl_t *impl = NULL;
axis2_char_t *lang = NULL;
w2c_qname2name_maker_t *qname2name_maker = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
impl = W2C_EXTENSION_INTF_TO_IMPL(extension);
qname2name_maker = &(impl-> qname2name_maker);
- lang = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE(conf, env);
+ lang = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE( conf, env);
/* this executes only with following configuration */
- if (AXIS2_STRCMP(lang, "c") == 0)
+ if ( AXIS2_STRCMP( lang, "c") == 0)
{
- W2C_ENGINE_CONFIGURATION_SET_QNAME2NAME(conf, env,
- qname2name_maker);
+ W2C_ENGINE_CONFIGURATION_SET_QNAME2NAME( conf, env,
+ qname2name_maker);
}
-
+
return AXIS2_SUCCESS;
}
@@ -112,11 +111,11 @@
axis2_char_t* AXIS2_CALL
w2c_c_qname2name_ext_suggest_name(w2c_qname2name_maker_t *qname2name_maker,
- const axis2_env_t *env,
- axis2_qname_t *qname)
+ const axis2_env_t *env,
+ axis2_qname_t *qname)
{
w2c_c_qname2name_ext_impl_t *impl = NULL;
-
+
axis2_char_t *key = NULL;
axis2_char_t *local = NULL;
int counter = 0;
@@ -124,89 +123,89 @@
axis2_char_t *given_name = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
+
impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker);
key = AXIS2_QNAME_TO_STRING(qname, env);
- local = (axis2_char_t*)axis2_hash_get(impl-> qname2name, key,
- AXIS2_HASH_KEY_STRING);
- if (local) /* key has been there somewhere */
+ local = (axis2_char_t*)axis2_hash_get( impl-> qname2name, key,
+ AXIS2_HASH_KEY_STRING );
+ if( local != NULL) /* key has been there somewhere */
{
return local;
}
/* otherwise */
- local = AXIS2_QNAME_GET_LOCALPART(qname, env);
- counter = (int)axis2_hash_get(impl-> name2number, local,
- AXIS2_HASH_KEY_STRING);
- if (counter == 0) /** this means name doesnt exist */
+ local = AXIS2_QNAME_GET_LOCALPART( qname, env);
+ counter = (int)axis2_hash_get( impl-> name2number, local,
+ AXIS2_HASH_KEY_STRING );
+ if ( counter == 0 ) /** this means name doesnt exist */
{
axis2_hash_set(impl-> qname2name, key, AXIS2_HASH_KEY_STRING, local);
axis2_hash_set(impl-> name2number, local, AXIS2_HASH_KEY_STRING, (void*)1);
return local;
}
- /* else qname would already exist */
+ /* else qname would already exist */
sprintf(counter_str, "%d", counter);
- given_name = axis2_stracat(local, counter_str, env);
+ given_name = axis2_stracat( local, counter_str, env);
axis2_hash_set(impl-> qname2name, key, AXIS2_HASH_KEY_STRING, given_name);
- axis2_hash_set(impl-> name2number, local, AXIS2_HASH_KEY_STRING, (void*)counter + 1);
+ axis2_hash_set(impl-> name2number, local, AXIS2_HASH_KEY_STRING, (void*)counter+1);
- return given_name;
+ return given_name;
}
axis2_status_t AXIS2_CALL
w2c_c_qname2name_ext_maker_free(w2c_qname2name_maker_t *qname2name_maker,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_c_qname2name_ext_impl_t *impl = NULL;
impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker);
- return w2c_c_qname2name_ext_free(
- (w2c_extension_t*)qname2name_maker, env);
+ return w2c_c_qname2name_ext_free(
+ (w2c_extension_t*)qname2name_maker, env);
}
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_extension_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_c_qname2name_ext_impl_t *impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- impl = (w2c_c_qname2name_ext_impl_t*)AXIS2_MALLOC(env-> allocator,
- sizeof(w2c_c_qname2name_ext_impl_t));
-
- if (NULL == impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ impl = (w2c_c_qname2name_ext_impl_t*)AXIS2_MALLOC( env-> allocator,
+ sizeof(w2c_c_qname2name_ext_impl_t) );
+
+ if(NULL == impl)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
impl->qname2name = axis2_hash_make(env);
impl->name2number = axis2_hash_make(env);
- impl->extension.ops =
- AXIS2_MALLOC(env->allocator, sizeof(w2c_extension_ops_t));
- if (NULL == impl->extension.ops)
+ impl->extension.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(w2c_extension_ops_t));
+ if(NULL == impl->extension.ops)
{
w2c_c_qname2name_ext_free(&(impl->extension), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
- }
- impl->qname2name_maker.ops =
- AXIS2_MALLOC(env->allocator, sizeof(w2c_qname2name_maker_ops_t));
- if (NULL == impl->qname2name_maker.ops)
+ }
+ impl->qname2name_maker.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(w2c_qname2name_maker_ops_t));
+ if(NULL == impl->qname2name_maker.ops)
{
w2c_c_qname2name_ext_free(&(impl->extension), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
- }
- impl->extension.ops->free =
- w2c_c_qname2name_ext_free;
- impl->extension.ops->engage =
- w2c_c_qname2name_ext_engage;
+ }
+ impl->extension.ops->free =
+ w2c_c_qname2name_ext_free;
+ impl->extension.ops->engage =
+ w2c_c_qname2name_ext_engage;
impl->qname2name_maker.ops->suggest_name =
- w2c_c_qname2name_ext_suggest_name;
+ w2c_c_qname2name_ext_suggest_name;
impl->qname2name_maker.ops->free =
- w2c_c_qname2name_ext_maker_free;
+ w2c_c_qname2name_ext_maker_free;
*inst = &(impl->extension);
@@ -216,11 +215,11 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_extension_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
if (inst)
{
status = W2C_EXTENSION_FREE(inst, env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/databinding_default_ext.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <w2c_extension.h>
#define W2C_DATABINDING_DEFAULT_EXT_FILENAME "c.default.typemap.xml"
@@ -22,8 +22,7 @@
{
w2c_extension_t extension;
-}
-w2c_databinding_default_ext_impl_t;
+} w2c_databinding_default_ext_impl_t;
#define W2C_INTF_TO_IMPL(extension) \
((w2c_databinding_default_ext_impl_t*) extension)
@@ -31,7 +30,7 @@
/************************* implmentations ********************************/
axis2_status_t AXIS2_CALL
w2c_databinding_default_ext_free(w2c_extension_t *extension,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_databinding_default_ext_impl_t *extension_impl = NULL;
@@ -39,11 +38,11 @@
extension_impl = W2C_INTF_TO_IMPL(extension);
- if (extension->ops)
+ if(extension->ops)
{
AXIS2_FREE(env->allocator, extension->ops);
}
- if (extension_impl)
+ if(extension_impl)
{
AXIS2_FREE(env->allocator, extension_impl);
}
@@ -53,29 +52,29 @@
axis2_status_t AXIS2_CALL
w2c_databinding_default_ext_engage(w2c_extension_t *extension,
- const axis2_env_t *env,
- w2c_engine_configuration_t *conf)
+ const axis2_env_t *env,
+ w2c_engine_configuration_t *conf)
{
w2c_databinding_default_ext_impl_t *extension_impl = NULL;
w2c_typemapper_t *typemapper = NULL;
axis2_char_t *db_type = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
extension_impl = W2C_INTF_TO_IMPL(extension);
- db_type = W2C_ENGINE_CONFIGURATION_GET_DATABINDING_TYPE(conf, env);
+ db_type = W2C_ENGINE_CONFIGURATION_GET_DATABINDING_TYPE( conf, env);
/* this executes only with following configuration */
- if (NULL == db_type || !AXIS2_STRCMP(db_type, "none"))
+ if ( NULL == db_type || !AXIS2_STRCMP( db_type, "none" ) )
{
- typemapper = W2C_ENGINE_CONFIGURATION_GET_TYPEMAPPER(conf, env);
- if (typemapper)
+ typemapper = W2C_ENGINE_CONFIGURATION_GET_TYPEMAPPER( conf, env);
+ if ( typemapper != NULL )
{
- W2C_TYPEMAPPER_FREE(typemapper, env);
+ W2C_TYPEMAPPER_FREE( typemapper, env );
}
- typemapper = w2c_typemapper_create_from_file(env,
- W2C_DATABINDING_DEFAULT_EXT_FILENAME);
- W2C_ENGINE_CONFIGURATION_SET_TYPEMAPPER(conf, env, typemapper);
+ typemapper = w2c_typemapper_create_from_file( env,
+ W2C_DATABINDING_DEFAULT_EXT_FILENAME );
+ W2C_ENGINE_CONFIGURATION_SET_TYPEMAPPER( conf, env, typemapper);
}
return AXIS2_SUCCESS;
}
@@ -83,32 +82,32 @@
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_extension_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_databinding_default_ext_impl_t *extension_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- extension_impl = (w2c_databinding_default_ext_impl_t*)AXIS2_MALLOC(env-> allocator,
- sizeof(w2c_databinding_default_ext_impl_t));
-
- if (NULL == extension_impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ extension_impl = (w2c_databinding_default_ext_impl_t*)AXIS2_MALLOC( env-> allocator,
+ sizeof(w2c_databinding_default_ext_impl_t) );
+
+ if(NULL == extension_impl)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
-
- extension_impl->extension.ops =
- AXIS2_MALLOC(env->allocator, sizeof(w2c_extension_ops_t));
- if (NULL == extension_impl->extension.ops)
+
+ extension_impl->extension.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(w2c_extension_ops_t));
+ if(NULL == extension_impl->extension.ops)
{
w2c_databinding_default_ext_free(&(extension_impl->extension), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
- }
- extension_impl->extension.ops->free =
- w2c_databinding_default_ext_free;
- extension_impl->extension.ops->engage =
- w2c_databinding_default_ext_engage;
+ }
+ extension_impl->extension.ops->free =
+ w2c_databinding_default_ext_free;
+ extension_impl->extension.ops->engage =
+ w2c_databinding_default_ext_engage;
*inst = &(extension_impl->extension);
@@ -117,11 +116,11 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_extension_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
if (inst)
{
status = W2C_EXTENSION_FREE(inst, env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/extensions/default_qname2name_ext.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <w2c_extension.h>
#include <w2c_string.h>
#include <w2c_qname2name_maker.h>
@@ -24,8 +24,7 @@
w2c_extension_t extension;
w2c_qname2name_maker_t qname2name_maker;
-}
-w2c_default_qname2name_ext_impl_t;
+} w2c_default_qname2name_ext_impl_t;
#define W2C_EXTENSION_INTF_TO_IMPL(extension) \
((w2c_default_qname2name_ext_impl_t*) extension)
@@ -36,7 +35,7 @@
/**************implmentations for w2c_extension_t methods**********************/
axis2_status_t AXIS2_CALL
w2c_default_qname2name_ext_free(w2c_extension_t *extension,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_default_qname2name_ext_impl_t *impl = NULL;
@@ -44,16 +43,16 @@
impl = W2C_EXTENSION_INTF_TO_IMPL(extension);
- if (extension->ops)
+ if(extension->ops)
{
AXIS2_FREE(env->allocator, extension->ops);
}
- if ((&impl->qname2name_maker)->ops)
+ if((&impl->qname2name_maker)->ops)
{
- AXIS2_FREE(env->allocator,
+ AXIS2_FREE(env->allocator,
(&impl->qname2name_maker)->ops);
}
- if (impl)
+ if(impl)
{
AXIS2_FREE(env->allocator, impl);
}
@@ -63,21 +62,21 @@
axis2_status_t AXIS2_CALL
w2c_default_qname2name_ext_engage(w2c_extension_t *extension,
- const axis2_env_t *env,
- w2c_engine_configuration_t *conf)
+ const axis2_env_t *env,
+ w2c_engine_configuration_t *conf)
{
w2c_default_qname2name_ext_impl_t *impl = NULL;
w2c_qname2name_maker_t *qname2name_maker = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
impl = W2C_EXTENSION_INTF_TO_IMPL(extension);
qname2name_maker = &(impl-> qname2name_maker);
/* this will executes for all configuration */
- W2C_ENGINE_CONFIGURATION_SET_QNAME2NAME(conf, env,
- qname2name_maker);
-
+ W2C_ENGINE_CONFIGURATION_SET_QNAME2NAME( conf, env,
+ qname2name_maker);
+
return AXIS2_SUCCESS;
}
@@ -85,71 +84,71 @@
axis2_char_t* AXIS2_CALL
w2c_default_qname2name_ext_suggest_name(w2c_qname2name_maker_t *qname2name_maker,
- const axis2_env_t *env,
- axis2_qname_t *qname)
+ const axis2_env_t *env,
+ axis2_qname_t *qname)
{
w2c_default_qname2name_ext_impl_t *impl = NULL;
-
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
+
impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker);
/** here nothing special would be happened */
- return AXIS2_QNAME_GET_LOCALPART(qname, env);
+ return AXIS2_QNAME_GET_LOCALPART( qname, env);
}
axis2_status_t AXIS2_CALL
w2c_default_qname2name_ext_maker_free(w2c_qname2name_maker_t *qname2name_maker,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_default_qname2name_ext_impl_t *impl = NULL;
impl = W2C_QNAME2NAME_MAKER_INTF_TO_IMPL(qname2name_maker);
- return w2c_default_qname2name_ext_free(
- (w2c_extension_t*)qname2name_maker, env);
+ return w2c_default_qname2name_ext_free(
+ (w2c_extension_t*)qname2name_maker, env);
}
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_extension_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_default_qname2name_ext_impl_t *impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- impl = (w2c_default_qname2name_ext_impl_t*)AXIS2_MALLOC(env-> allocator,
- sizeof(w2c_default_qname2name_ext_impl_t));
-
- if (NULL == impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ impl = (w2c_default_qname2name_ext_impl_t*)AXIS2_MALLOC( env-> allocator,
+ sizeof(w2c_default_qname2name_ext_impl_t) );
+
+ if(NULL == impl)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- impl->extension.ops =
- AXIS2_MALLOC(env->allocator, sizeof(w2c_extension_ops_t));
- if (NULL == impl->extension.ops)
+ impl->extension.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(w2c_extension_ops_t));
+ if(NULL == impl->extension.ops)
{
w2c_default_qname2name_ext_free(&(impl->extension), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
}
- impl->qname2name_maker.ops =
- AXIS2_MALLOC(env->allocator, sizeof(w2c_qname2name_maker_ops_t));
- if (NULL == impl->extension.ops)
+ impl->qname2name_maker.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(w2c_qname2name_maker_ops_t));
+ if(NULL == impl->extension.ops)
{
w2c_default_qname2name_ext_free(&(impl->extension), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return AXIS2_FAILURE;
- }
+ }
- impl->extension.ops->free =
- w2c_default_qname2name_ext_free;
- impl->extension.ops->engage =
- w2c_default_qname2name_ext_engage;
+ impl->extension.ops->free =
+ w2c_default_qname2name_ext_free;
+ impl->extension.ops->engage =
+ w2c_default_qname2name_ext_engage;
impl->qname2name_maker.ops->suggest_name =
- w2c_default_qname2name_ext_suggest_name;
+ w2c_default_qname2name_ext_suggest_name;
impl->qname2name_maker.ops->free =
- w2c_default_qname2name_ext_maker_free;
+ w2c_default_qname2name_ext_maker_free;
*inst = &(impl->extension);
@@ -158,11 +157,11 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_extension_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
if (inst)
{
status = W2C_EXTENSION_FREE(inst, env);
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cservice_xml_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cservice_xml_writer.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cservice_xml_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cservice_xml_writer.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <writer_protected.h>
#include <w2c_file_writer.h>
@@ -21,9 +21,9 @@
/************************* overrided functions ********************************/
axis2_char_t* AXIS2_CALL
w2c_cservice_xml_writer_create_out_file(w2c_writer_t *writer,
- const axis2_env_t *env,
- axis2_char_t* package_name,
- axis2_char_t* file_name)
+ const axis2_env_t *env,
+ axis2_char_t* package_name,
+ axis2_char_t* file_name)
{
w2c_writer_impl_t* writer_impl = NULL;
axis2_char_t* output_locat = NULL;
@@ -34,33 +34,33 @@
/* here the file_name, package_name would be build */
file_name = "services";
package_name = "";
- output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION(
- writer_impl-> config, env);
+ output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION (
+ writer_impl-> config, env);
writer_impl ->out_filename =
- w2c_file_writer_create_classfile_name(env, output_locat,
- package_name,
- file_name,
- ".xml");
+ w2c_file_writer_create_classfile_name (env, output_locat,
+ package_name,
+ file_name,
+ ".xml");
return writer_impl ->out_filename;
}
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_writer_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_writer_impl_t* writer_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- writer_impl = w2c_writer_create_impl(env);
- if (!writer_impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ writer_impl = w2c_writer_create_impl (env);
+ if(!writer_impl)
{
return AXIS2_FAILURE;
}
- w2c_writer_set_self_name(writer_impl, env, W2C_CSERVICE_XML_WRITER_CLASS);
+ w2c_writer_set_self_name ( writer_impl, env, W2C_CSERVICE_XML_WRITER_CLASS );
/* bit of overriding */
- writer_impl->writer.ops->create_out_file =
- w2c_cservice_xml_writer_create_out_file;
+ writer_impl->writer.ops->create_out_file =
+ w2c_cservice_xml_writer_create_out_file;
*inst = &(writer_impl->writer);
@@ -69,13 +69,13 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_writer_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- axis2_status_t status = AXIS2_FAILURE;
+ axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (inst)
- {
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ if (inst)
+ {
status = W2C_WRITER_FREE(inst, env);
}
return status;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_header_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_header_writer.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_header_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_header_writer.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <writer_protected.h>
#include <w2c_file_writer.h>
@@ -21,9 +21,9 @@
/************************* overrided functions ********************************/
axis2_char_t* AXIS2_CALL
w2c_cskel_header_writer_create_out_file(w2c_writer_t *writer,
- const axis2_env_t *env,
- axis2_char_t* package_name,
- axis2_char_t* file_name)
+ const axis2_env_t *env,
+ axis2_char_t* package_name,
+ axis2_char_t* file_name)
{
w2c_writer_impl_t* writer_impl = NULL;
axis2_char_t* output_locat = NULL;
@@ -33,13 +33,13 @@
/* here the package_name would be build */
package_name = "";
- output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION(
- writer_impl-> config, env);
+ output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION (
+ writer_impl-> config, env);
writer_impl ->out_filename =
- w2c_file_writer_create_classfile_name(env, output_locat,
- package_name,
- file_name,
- ".h");
+ w2c_file_writer_create_classfile_name (env, output_locat,
+ package_name,
+ file_name,
+ ".h");
return writer_impl ->out_filename;
}
@@ -47,20 +47,20 @@
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_writer_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_writer_impl_t* writer_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- writer_impl = w2c_writer_create_impl(env);
- if (!writer_impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ writer_impl = w2c_writer_create_impl (env);
+ if(!writer_impl)
{
return AXIS2_FAILURE;
}
- w2c_writer_set_self_name(writer_impl, env, W2C_CSKEL_HEADER_WRITER_CLASS);
+ w2c_writer_set_self_name ( writer_impl, env, W2C_CSKEL_HEADER_WRITER_CLASS );
/* bit of overriding */
- writer_impl->writer.ops->create_out_file =
- w2c_cskel_header_writer_create_out_file;
+ writer_impl->writer.ops->create_out_file =
+ w2c_cskel_header_writer_create_out_file;
*inst = &(writer_impl->writer);
@@ -69,13 +69,13 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_writer_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- axis2_status_t status = AXIS2_FAILURE;
+ axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (inst)
- {
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ if (inst)
+ {
status = W2C_WRITER_FREE(inst, env);
}
return status;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_source_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_source_writer.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_source_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cskel_source_writer.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <writer_protected.h>
#include <w2c_file_writer.h>
@@ -21,9 +21,9 @@
/************************* overrided functions ********************************/
axis2_char_t* AXIS2_CALL
w2c_cskel_source_writer_create_out_file(w2c_writer_t *writer,
- const axis2_env_t *env,
- axis2_char_t* package_name,
- axis2_char_t* file_name)
+ const axis2_env_t *env,
+ axis2_char_t* package_name,
+ axis2_char_t* file_name)
{
w2c_writer_impl_t* writer_impl = NULL;
axis2_char_t* output_locat = NULL;
@@ -34,14 +34,14 @@
/* here the package_name would be build */
package_name = "";
- ext_name = w2c_writer_get_extension(writer_impl, env);
- output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION(
- writer_impl-> config, env);
+ ext_name = w2c_writer_get_extension ( writer_impl, env );
+ output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION (
+ writer_impl-> config, env);
writer_impl ->out_filename =
- w2c_file_writer_create_classfile_name(env, output_locat,
- package_name,
- file_name,
- ext_name);
+ w2c_file_writer_create_classfile_name (env, output_locat,
+ package_name,
+ file_name,
+ ext_name);
return writer_impl ->out_filename;
}
@@ -49,20 +49,20 @@
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_writer_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_writer_impl_t* writer_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- writer_impl = w2c_writer_create_impl(env);
- if (!writer_impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ writer_impl = w2c_writer_create_impl (env);
+ if(!writer_impl)
{
return AXIS2_FAILURE;
}
- w2c_writer_set_self_name(writer_impl, env, W2C_CSKEL_SOURCE_WRITER_CLASS);
+ w2c_writer_set_self_name ( writer_impl, env, W2C_CSKEL_SOURCE_WRITER_CLASS );
/* bit of overriding */
- writer_impl->writer.ops->create_out_file =
- w2c_cskel_source_writer_create_out_file;
+ writer_impl->writer.ops->create_out_file =
+ w2c_cskel_source_writer_create_out_file;
*inst = &(writer_impl->writer);
@@ -71,13 +71,13 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_writer_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- axis2_status_t status = AXIS2_FAILURE;
+ axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (inst)
- {
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ if (inst)
+ {
status = W2C_WRITER_FREE(inst, env);
}
return status;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_header_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_header_writer.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_header_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_header_writer.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <writer_protected.h>
#include <w2c_file_writer.h>
@@ -21,9 +21,9 @@
/************************* overrided functions ********************************/
axis2_char_t* AXIS2_CALL
w2c_cstub_header_writer_create_out_file(w2c_writer_t *writer,
- const axis2_env_t *env,
- axis2_char_t* package_name,
- axis2_char_t* file_name)
+ const axis2_env_t *env,
+ axis2_char_t* package_name,
+ axis2_char_t* file_name)
{
w2c_writer_impl_t* writer_impl = NULL;
axis2_char_t* output_locat = NULL;
@@ -35,13 +35,13 @@
/* here the package_name would be build */
package_name = "";
- output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION(
- writer_impl-> config, env);
+ output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION (
+ writer_impl-> config, env);
writer_impl ->out_filename =
- w2c_file_writer_create_classfile_name(env, output_locat,
- package_name,
- file_name,
- ext_name);
+ w2c_file_writer_create_classfile_name (env, output_locat,
+ package_name,
+ file_name,
+ ext_name);
return writer_impl ->out_filename;
}
@@ -49,20 +49,20 @@
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_writer_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_writer_impl_t* writer_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- writer_impl = w2c_writer_create_impl(env);
- if (!writer_impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ writer_impl = w2c_writer_create_impl (env);
+ if(!writer_impl)
{
return AXIS2_FAILURE;
}
- w2c_writer_set_self_name(writer_impl, env, W2C_CSTUB_HEADER_WRITER_CLASS);
+ w2c_writer_set_self_name ( writer_impl, env, W2C_CSTUB_HEADER_WRITER_CLASS );
/* bit of overriding */
- writer_impl->writer.ops->create_out_file =
- w2c_cstub_header_writer_create_out_file;
+ writer_impl->writer.ops->create_out_file =
+ w2c_cstub_header_writer_create_out_file;
*inst = &(writer_impl->writer);
@@ -71,13 +71,13 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_writer_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- axis2_status_t status = AXIS2_FAILURE;
+ axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (inst)
- {
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ if (inst)
+ {
status = W2C_WRITER_FREE(inst, env);
}
return status;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_source_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_source_writer.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_source_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/cstub_source_writer.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <writer_protected.h>
#include <w2c_file_writer.h>
@@ -21,9 +21,9 @@
/************************* overrided functions ********************************/
axis2_char_t* AXIS2_CALL
w2c_cstub_source_writer_create_out_file(w2c_writer_t *writer,
- const axis2_env_t *env,
- axis2_char_t* package_name,
- axis2_char_t* file_name)
+ const axis2_env_t *env,
+ axis2_char_t* package_name,
+ axis2_char_t* file_name)
{
w2c_writer_impl_t* writer_impl = NULL;
axis2_char_t* output_locat = NULL;
@@ -31,17 +31,17 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
writer_impl = W2C_INTF_TO_IMPL(writer);
- ext_name = w2c_writer_get_extension(writer_impl, env);
+ ext_name = w2c_writer_get_extension ( writer_impl, env );
/* here the package_name would be build */
package_name = "";
- output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION(
- writer_impl-> config, env);
+ output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION (
+ writer_impl-> config, env);
writer_impl ->out_filename =
- w2c_file_writer_create_classfile_name(env, output_locat,
- package_name,
- file_name,
- ext_name);
+ w2c_file_writer_create_classfile_name (env, output_locat,
+ package_name,
+ file_name,
+ ext_name);
return writer_impl ->out_filename;
}
@@ -49,20 +49,20 @@
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_writer_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_writer_impl_t* writer_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- writer_impl = w2c_writer_create_impl(env);
- if (!writer_impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ writer_impl = w2c_writer_create_impl (env);
+ if(!writer_impl)
{
return AXIS2_FAILURE;
}
- w2c_writer_set_self_name(writer_impl, env, W2C_CSTUB_SOURCE_WRITER_CLASS);
+ w2c_writer_set_self_name ( writer_impl, env, W2C_CSTUB_SOURCE_WRITER_CLASS );
/* bit of overriding */
- writer_impl->writer.ops->create_out_file =
- w2c_cstub_source_writer_create_out_file;
+ writer_impl->writer.ops->create_out_file =
+ w2c_cstub_source_writer_create_out_file;
*inst = &(writer_impl->writer);
@@ -71,13 +71,13 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_writer_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- axis2_status_t status = AXIS2_FAILURE;
+ axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (inst)
- {
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ if (inst)
+ {
status = W2C_WRITER_FREE(inst, env);
}
return status;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/csvc_skeleton_writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/csvc_skeleton_writer.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/csvc_skeleton_writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/csvc_skeleton_writer.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <writer_protected.h>
#include <w2c_file_writer.h>
@@ -21,9 +21,9 @@
/************************* overrided functions ********************************/
axis2_char_t* AXIS2_CALL
w2c_csvc_skeleton_writer_create_out_file(w2c_writer_t *writer,
- const axis2_env_t *env,
- axis2_char_t* package_name,
- axis2_char_t* file_name)
+ const axis2_env_t *env,
+ axis2_char_t* package_name,
+ axis2_char_t* file_name)
{
w2c_writer_impl_t* writer_impl = NULL;
axis2_char_t* output_locat = NULL;
@@ -34,14 +34,14 @@
/* here the package_name would be build */
package_name = "";
- ext_name = w2c_writer_get_extension(writer_impl, env);
- output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION(
- writer_impl-> config, env);
+ ext_name = w2c_writer_get_extension ( writer_impl, env );
+ output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION (
+ writer_impl-> config, env);
writer_impl ->out_filename =
- w2c_file_writer_create_classfile_name(env, output_locat,
- package_name,
- file_name,
- ext_name);
+ w2c_file_writer_create_classfile_name (env, output_locat,
+ package_name,
+ file_name,
+ ext_name);
return writer_impl ->out_filename;
}
@@ -49,20 +49,20 @@
/****************** standard create and delete for DLL ************************/
AXIS2_EXPORT int
axis2_get_instance(w2c_writer_t **inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_writer_impl_t* writer_impl = NULL;
-
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- writer_impl = w2c_writer_create_impl(env);
- if (!writer_impl)
+
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ writer_impl = w2c_writer_create_impl (env);
+ if(!writer_impl)
{
return AXIS2_FAILURE;
}
- w2c_writer_set_self_name(writer_impl, env, W2C_CSVC_SKELETON_WRITER_CLASS);
+ w2c_writer_set_self_name ( writer_impl, env, W2C_CSVC_SKELETON_WRITER_CLASS );
/* bit of overriding */
- writer_impl->writer.ops->create_out_file =
- w2c_csvc_skeleton_writer_create_out_file;
+ writer_impl->writer.ops->create_out_file =
+ w2c_csvc_skeleton_writer_create_out_file;
*inst = &(writer_impl->writer);
@@ -71,13 +71,13 @@
AXIS2_EXPORT int
axis2_remove_instance(w2c_writer_t *inst,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
- axis2_status_t status = AXIS2_FAILURE;
+ axis2_status_t status = AXIS2_FAILURE;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (inst)
- {
+ AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
+ if (inst)
+ {
status = W2C_WRITER_FREE(inst, env);
}
return status;
Modified: webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c?view=diff&rev=450427&r1=450426&r2=450427
==============================================================================
--- webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c (original)
+++ webservices/axis2/trunk/c/tools/codegen/src/wsdl/writer/writer.c Wed Sep 27 06:07:26 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+
#include <writer_protected.h>
#include <axis2_array_list.h>
#include <axis2_string.h>
@@ -25,25 +25,25 @@
#include <w2c_xslt_utils.h>
-AXIS2_EXTERN w2c_writer_impl_t * AXIS2_CALL
-w2c_writer_create_impl(const axis2_env_t *env)
+AXIS2_EXTERN w2c_writer_impl_t * AXIS2_CALL
+w2c_writer_create_impl (const axis2_env_t *env)
{
w2c_writer_impl_t *writer_impl = NULL;
-
+
AXIS2_ENV_CHECK(env, NULL);
writer_impl = (w2c_writer_impl_t *) AXIS2_MALLOC(env->
- allocator, sizeof(w2c_writer_impl_t));
+ allocator, sizeof(w2c_writer_impl_t));
- if (NULL == writer_impl)
+ if(NULL == writer_impl)
{
- AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+ AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
return NULL;
}
-
- writer_impl->writer.ops =
- AXIS2_MALLOC(env->allocator, sizeof(w2c_writer_ops_t));
- if (NULL == writer_impl->writer.ops)
+
+ writer_impl->writer.ops =
+ AXIS2_MALLOC (env->allocator, sizeof(w2c_writer_ops_t));
+ if(NULL == writer_impl->writer.ops)
{
w2c_writer_free(&(writer_impl->writer), env);
AXIS2_ERROR_SET(env->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -67,40 +67,40 @@
axis2_status_t AXIS2_CALL
w2c_writer_free(w2c_writer_t *writer,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
w2c_writer_impl_t *writer_impl = NULL;
-
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
+
writer_impl = W2C_INTF_TO_IMPL(writer);
+
+ if( writer_impl->xslt_filename )
+ AXIS2_FREE (env->allocator, writer_impl-> xslt_filename);
+ if( writer_impl->out_filename )
+ AXIS2_FREE (env->allocator, writer_impl-> out_filename);
+ if( writer_impl->language)
+ AXIS2_FREE (env->allocator, writer_impl-> language);
- if (writer_impl->xslt_filename)
- AXIS2_FREE(env->allocator, writer_impl-> xslt_filename);
- if (writer_impl->out_filename)
- AXIS2_FREE(env->allocator, writer_impl-> out_filename);
- if (writer_impl->language)
- AXIS2_FREE(env->allocator, writer_impl-> language);
-
- if (writer->ops)
+ if(writer->ops)
{
AXIS2_FREE(env->allocator, writer->ops);
writer->ops = NULL;
}
- if (writer_impl)
+ if(writer_impl)
{
AXIS2_FREE(env->allocator, writer_impl);
writer_impl = NULL;
}
-
+
return AXIS2_SUCCESS;
}
axis2_char_t* AXIS2_CALL
w2c_writer_create_out_file(w2c_writer_t *writer,
- const axis2_env_t *env,
- axis2_char_t* package_name,
- axis2_char_t* file_name)
+ const axis2_env_t *env,
+ axis2_char_t* package_name,
+ axis2_char_t* file_name)
{
w2c_writer_impl_t* writer_impl = NULL;
axis2_char_t* ext_name = NULL;
@@ -109,43 +109,43 @@
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
writer_impl = W2C_INTF_TO_IMPL(writer);
- ext_name = w2c_writer_get_extension(writer_impl, env);
- output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION(
- writer_impl-> config, env);
- writer_impl ->out_filename =
- w2c_file_writer_create_classfile_name(env, output_locat,
- package_name,
- file_name,
- ext_name);
- return writer_impl ->out_filename;
+ ext_name = w2c_writer_get_extension ( writer_impl, env );
+ output_locat = W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LOCATION (
+ writer_impl-> config, env);
+ writer_impl ->out_filename =
+ w2c_file_writer_create_classfile_name (env, output_locat,
+ package_name,
+ file_name,
+ ext_name );
+ return writer_impl ->out_filename;
}
axis2_status_t AXIS2_CALL
w2c_writer_parse(w2c_writer_t *writer,
- const axis2_env_t *env,
- axiom_node_t* root)
+ const axis2_env_t *env,
+ axiom_node_t* root)
{
w2c_writer_impl_t *writer_impl = NULL;
axis2_char_t* buffer = NULL;
-
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
writer_impl = W2C_INTF_TO_IMPL(writer);
buffer = w2c_xslt_utils_serialize(env, root);
-
- w2c_xslt_template_processor_parse(env, buffer,
- writer_impl-> xslt_filename,
- writer_impl-> out_filename);
- AXIS2_FREE(env-> allocator, buffer);
+
+ w2c_xslt_template_processor_parse (env, buffer,
+ writer_impl-> xslt_filename,
+ writer_impl-> out_filename);
+ AXIS2_FREE ( env-> allocator, buffer );
return AXIS2_SUCCESS;
}
axis2_status_t AXIS2_CALL
w2c_writer_initialize(w2c_writer_t *writer,
- const axis2_env_t *env,
- w2c_config_property_loader_t* loader,
- w2c_engine_configuration_t* config)
+ const axis2_env_t *env,
+ w2c_config_property_loader_t* loader,
+ w2c_engine_configuration_t* config)
{
w2c_writer_impl_t *writer_impl = NULL;
axis2_status_t status = AXIS2_SUCCESS;
@@ -155,8 +155,8 @@
writer_impl-> config = config;
writer_impl-> loader = loader;
- w2c_writer_set_language(writer_impl, env);
- status = w2c_writer_load_template(writer_impl, env);
+ w2c_writer_set_language (writer_impl, env);
+ status = w2c_writer_load_template (writer_impl, env);
return status;
}
@@ -165,8 +165,8 @@
* implementation for protected functions
*/
axis2_char_t*
-w2c_writer_get_extension(w2c_writer_impl_t *writer_impl,
- const axis2_env_t *env)
+w2c_writer_get_extension( w2c_writer_impl_t *writer_impl,
+ const axis2_env_t *env)
{
axis2_hash_t *lang_map = NULL;
axis2_hash_t *lang_speci_map = NULL;
@@ -178,29 +178,29 @@
int index = 0;
axis2_char_t *ext_name = NULL;
axis2_array_list_t *arr_list = NULL;
-
+
lang_map = W2C_CONFIG_PROPERTY_LOADER_GET_LANGUAGE_SPECIFIC_PROPERTIES_MAP
- (writer_impl->loader, env);
-
- lang_speci_map = axis2_hash_get(lang_map,
- writer_impl-> language, AXIS2_HASH_KEY_STRING);
-
+ ( writer_impl->loader, env );
+
+ lang_speci_map = axis2_hash_get( lang_map,
+ writer_impl-> language, AXIS2_HASH_KEY_STRING);
+
for (hi = axis2_hash_first(lang_speci_map, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ hi; hi = axis2_hash_next(env, hi))
{
axis2_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
- if (key && arr_list)
+ if ( key && arr_list)
{
- suf_length = AXIS2_STRLEN(W2C_WRITER_EXTENSION_SUFFIX);
- all_length = AXIS2_STRLEN(key);
+ suf_length = AXIS2_STRLEN( W2C_WRITER_EXTENSION_SUFFIX );
+ all_length = AXIS2_STRLEN( key);
index = w2c_string_indexof_cs
- (key, W2C_WRITER_EXTENSION_SUFFIX);
- if (index + suf_length == all_length)/* this meen its a suf*/
+ (key, W2C_WRITER_EXTENSION_SUFFIX );
+ if ( index + suf_length == all_length )/* this meen its a suf*/
{
- value = AXIS2_ARRAY_LIST_GET(arr_list, env, 0);
- ext_name = AXIS2_STRDUP(".", env);
- ext_name = w2c_string_add_string(ext_name, value, env);
- break;
+ value = AXIS2_ARRAY_LIST_GET( arr_list, env, 0);
+ ext_name = AXIS2_STRDUP (".", env );
+ ext_name = w2c_string_add_string ( ext_name, value, env);
+ break;
}
}
}
@@ -208,9 +208,9 @@
}
axis2_char_t *
-w2c_writer_find_template(w2c_writer_impl_t *writer_impl,
- const axis2_env_t *env,
- axis2_hash_t *lang_speci_map)
+w2c_writer_find_template ( w2c_writer_impl_t *writer_impl,
+ const axis2_env_t *env,
+ axis2_hash_t *lang_speci_map)
{
axis2_char_t *key = NULL;
axis2_char_t *value = NULL;
@@ -220,29 +220,29 @@
int index = 0;
axis2_char_t *tmpl_name = NULL;
axis2_array_list_t *arr_list = NULL;
-
+
for (hi = axis2_hash_first(lang_speci_map, env) ;
- hi; hi = axis2_hash_next(env, hi))
+ hi; hi = axis2_hash_next(env, hi))
{
axis2_hash_this(hi, (void*)&key, NULL, (void*)&arr_list);
- if (key && arr_list)
+ if ( key && arr_list)
{
- suf_length = AXIS2_STRLEN(W2C_WRITER_TEMPLATE_SUFFIX);
- all_length = AXIS2_STRLEN(key);
+ suf_length = AXIS2_STRLEN( W2C_WRITER_TEMPLATE_SUFFIX );
+ all_length = AXIS2_STRLEN(key );
index = w2c_string_indexof_cs
- (key, W2C_WRITER_TEMPLATE_SUFFIX);
- if (index + suf_length == all_length)/* this meen its a suf*/
+ (key, W2C_WRITER_TEMPLATE_SUFFIX );
+ if ( index + suf_length == all_length )/* this meen its a suf*/
{
- value = AXIS2_ARRAY_LIST_GET(arr_list, env, 0);
- index = w2c_string_indexof_cs
- (value, writer_impl-> self_name);
- if (0 == index) /* prefix matches for the first entry*/
- {
- value = AXIS2_ARRAY_LIST_GET(arr_list, env, 1);
- tmpl_name = AXIS2_STRDUP("", env);
- tmpl_name = w2c_string_add_string(tmpl_name, value, env);
- break;
- }
+ value = AXIS2_ARRAY_LIST_GET ( arr_list, env, 0 );
+ index = w2c_string_indexof_cs
+ (value, writer_impl-> self_name );
+ if (0 == index) /* prefix matches for the first entry*/
+ {
+ value = AXIS2_ARRAY_LIST_GET ( arr_list, env, 1);
+ tmpl_name = AXIS2_STRDUP ("", env );
+ tmpl_name = w2c_string_add_string ( tmpl_name, value, env);
+ break;
+ }
}
}
}
@@ -250,9 +250,9 @@
}
axis2_status_t
-w2c_writer_set_self_name(w2c_writer_impl_t* writer_impl,
- const axis2_env_t* env,
- axis2_char_t* self_name)
+w2c_writer_set_self_name( w2c_writer_impl_t* writer_impl,
+ const axis2_env_t* env,
+ axis2_char_t* self_name)
{
writer_impl -> self_name = AXIS2_STRDUP(self_name, env);
return AXIS2_SUCCESS;
@@ -261,17 +261,17 @@
axis2_status_t
w2c_writer_set_language(w2c_writer_impl_t *writer_impl,
- const axis2_env_t *env)
-
+ const axis2_env_t *env)
+
{
axis2_char_t* lang = NULL;
- lang =
- W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE(writer_impl-> config, env);
- if (NULL == lang)
+ lang =
+ W2C_ENGINE_CONFIGURATION_GET_OUTPUT_LANGUAGE ( writer_impl-> config, env);
+ if (NULL == lang )
{
- lang =
+ lang =
W2C_CONFIG_PROPERTY_LOADER_GET_DEFAULT_LANGUAGE(writer_impl->loader, env);
- if (NULL == lang)
+ if ( NULL == lang )
return AXIS2_FAILURE;
}
writer_impl-> language = AXIS2_STRDUP(lang, env);
@@ -280,40 +280,40 @@
axis2_status_t
w2c_writer_load_template(w2c_writer_impl_t *writer_impl,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
axis2_hash_t* lang_map = NULL;
axis2_hash_t* lang_speci_map = NULL;
axis2_char_t* file_path = NULL;
axis2_char_t* tmpl_name = NULL;
-
+
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- if (NULL == writer_impl-> language)
- return AXIS2_FAILURE;
+ if ( NULL == writer_impl-> language )
+ return AXIS2_FAILURE;
file_path = getenv("AXIS2C_HOME");
- file_path = AXIS2_STRDUP(file_path, env);
- if (NULL == file_path)
+ file_path = AXIS2_STRDUP ( file_path, env);
+ if ( NULL == file_path)
{
return AXIS2_FAILURE;
}
-
+
lang_map = W2C_CONFIG_PROPERTY_LOADER_GET_LANGUAGE_SPECIFIC_PROPERTIES_MAP
- (writer_impl->loader, env);
-
- lang_speci_map = axis2_hash_get(lang_map,
- writer_impl-> language, AXIS2_HASH_KEY_STRING);
-
- tmpl_name = w2c_writer_find_template(writer_impl, env, lang_speci_map);
- if (NULL == tmpl_name || *tmpl_name == '\0')
+ ( writer_impl->loader, env );
+
+ lang_speci_map = axis2_hash_get( lang_map,
+ writer_impl-> language, AXIS2_HASH_KEY_STRING);
+
+ tmpl_name = w2c_writer_find_template( writer_impl, env, lang_speci_map);
+ if ( NULL == tmpl_name || *tmpl_name =='\0')
{
- AXIS2_FREE(env-> allocator, file_path);
+ AXIS2_FREE ( env-> allocator, file_path );
return AXIS2_FAILURE;
}
- file_path = w2c_string_add_string(file_path, W2C_WRITER_XSLT_PATH, env);
- file_path = w2c_string_add_string(file_path, tmpl_name, env);
+ file_path = w2c_string_add_string(file_path, W2C_WRITER_XSLT_PATH, env );
+ file_path = w2c_string_add_string(file_path, tmpl_name, env );
writer_impl-> xslt_filename = file_path;
return AXIS2_SUCCESS;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org