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/08/29 07:25:59 UTC
svn commit: r437970 - in /webservices/axis2/trunk/c: rampart/include/
rampart/src/handlers/ rampart/src/util/ util/src/ xml_schema/include/
Author: nandika
Date: Mon Aug 28 22:25:58 2006
New Revision: 437970
URL: http://svn.apache.org/viewvc?rev=437970&view=rev
Log:
warnings fixed , comments added
Modified:
webservices/axis2/trunk/c/rampart/include/openssl_pkey.h
webservices/axis2/trunk/c/rampart/include/oxs_enc.h
webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c
webservices/axis2/trunk/c/rampart/src/util/rampart_action.c
webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c
webservices/axis2/trunk/c/util/src/allocator.c
webservices/axis2/trunk/c/util/src/date_time.c
webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h
Modified: webservices/axis2/trunk/c/rampart/include/openssl_pkey.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/openssl_pkey.h?rev=437970&r1=437969&r2=437970&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/openssl_pkey.h (original)
+++ webservices/axis2/trunk/c/rampart/include/openssl_pkey.h Mon Aug 28 22:25:58 2006
@@ -26,8 +26,8 @@
* @file
* @brief
*/
-#ifndef OPENSSL_PKEY
-#define OPENSSL_PKEY
+#ifndef OPENSSL_PKEY_H
+#define OPENSSL_PKEY_H
#ifdef __cplusplus
extern "C" {
@@ -165,4 +165,4 @@
}
#endif
-#endif /* OPENSSL_PKEY */
+#endif /* OPENSSL_PKEY_H */
Modified: webservices/axis2/trunk/c/rampart/include/oxs_enc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_enc.h?rev=437970&r1=437969&r2=437970&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_enc.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_enc.h Mon Aug 28 22:25:58 2006
@@ -24,7 +24,6 @@
*/
#include <axis2_defines.h>
-#include <oxs_strings.h>
#include <oxs_ctx.h>
#include <axis2_env.h>
#include <axiom_node.h>
@@ -39,11 +38,11 @@
*@node node to be encrypted
*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-oxs_enc_xml_encrypt(const axis2_env_t *env,
- enc_ctx_t* ctx,
- axiom_node_t* tmpl,
- axiom_node_t* node
- );
+oxs_enc_xml_encrypt(
+ const axis2_env_t *env,
+ enc_ctx_t* ctx,
+ axiom_node_t* tmpl,
+ axiom_node_t* node);
/**
*@data data to be encrypted
Modified: webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c?rev=437970&r1=437969&r2=437970&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c (original)
+++ webservices/axis2/trunk/c/rampart/src/handlers/rampart_in_handler.c Mon Aug 28 22:25:58 2006
@@ -240,8 +240,9 @@
status = AXIS2_SUCCESS;
}else{
/*TODO return a fault*/
- AXIS2_LOG_INFO(env->log,"[rampart][rampart_in_handler] Timestamp is not valid ");
axis2_array_list_t *sub_codes = NULL;
+
+ AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI, "[rampart] Timestamp is not valid");
sub_codes = axis2_array_list_create(env, 1);
if (sub_codes)
{
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_action.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_action.c?rev=437970&r1=437969&r2=437970&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_action.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_action.c Mon Aug 28 22:25:58 2006
@@ -22,6 +22,7 @@
#include <axis2_util.h>
#include <rampart_action.h>
#include <rampart_constants.h>
+#include <rampart_handler_util.h>
@@ -269,9 +270,8 @@
AXIS2_EXTERN rampart_actions_t *AXIS2_CALL
rampart_actions_create(const axis2_env_t *env)
{
- AXIS2_ENV_CHECK(env, NULL);
-
rampart_actions_impl_t * actions_impl= NULL;
+ AXIS2_ENV_CHECK(env, NULL);
actions_impl = AXIS2_MALLOC(env->allocator,sizeof(rampart_actions_impl_t));
if (!actions_impl)
{
@@ -766,7 +766,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
rampart_actions_reset( rampart_actions_t * actions, const axis2_env_t *env)
{
rampart_actions_impl_t * actions_impl= NULL;
@@ -790,7 +790,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
rampart_actions_free( rampart_actions_t * actions, const axis2_env_t *env)
{
rampart_actions_impl_t * actions_impl= NULL;
@@ -875,7 +875,7 @@
}
/*Populate actions by extracting values from parameters set*/
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
rampart_actions_populate_from_params (rampart_actions_t *actions,
const axis2_env_t *env, axis2_param_t *param_action )
{
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c?rev=437970&r1=437969&r2=437970&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c Mon Aug 28 22:25:58 2006
@@ -23,6 +23,7 @@
#include <oxs_token_encrypted_data.h>
#include <oxs_token_encrypted_key.h>
#include <oxs_token_encryption_method.h>
+#include <oxs_token_data_reference.h>
#include <oxs_token_cipher_data.h>
#include <oxs_token_cipher_value.h>
#include <oxs_token_key_info.h>
@@ -282,7 +283,6 @@
axiom_soap_envelope_t *soap_envelope ,
axiom_node_t *sec_node)
{
- axis2_status_t ret = AXIS2_FAILURE;
axiom_node_t *enc_data_node = NULL, *parent_of_enc_node = NULL;
axiom_node_t *body_node = NULL, *header_node = NULL/*, *decrypted_node = NULL*/;
axiom_node_t *ref_list_node = NULL;
@@ -294,8 +294,8 @@
oxs_key_t *session_key = NULL;
axis2_array_list_t *uuid_list = NULL;
oxs_enc_engine_t *enc_engine = NULL;
- ret = AXIS2_FAILURE;
rampart_crypto_engine_impl_t *engine_impl = NULL;
+ axis2_status_t ret = AXIS2_FAILURE;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
engine_impl = AXIS2_INTF_TO_IMPL(engine);
Modified: webservices/axis2/trunk/c/util/src/allocator.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/allocator.c?rev=437970&r1=437969&r2=437970&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/allocator.c (original)
+++ webservices/axis2/trunk/c/util/src/allocator.c Mon Aug 28 22:25:58 2006
@@ -73,5 +73,5 @@
void AXIS2_CALL
axis2_allocator_free_impl(axis2_allocator_t *allocator, void *ptr)
{
- return free(ptr);
+ free(ptr);
}
Modified: webservices/axis2/trunk/c/util/src/date_time.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/date_time.c?rev=437970&r1=437969&r2=437970&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/src/date_time.c (original)
+++ webservices/axis2/trunk/c/util/src/date_time.c Mon Aug 28 22:25:58 2006
@@ -269,7 +269,7 @@
struct tm* time = NULL;
char* time_str = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
date_time_impl = AXIS2_INTF_TO_IMPL(date_time);
time = date_time_impl->utcTime;
@@ -287,7 +287,7 @@
struct tm* time= NULL;
char* date_str = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
date_time_impl = AXIS2_INTF_TO_IMPL(date_time);
time = date_time_impl->utcTime;
@@ -307,7 +307,7 @@
struct tm* time = NULL;
char* date_time_str = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
date_time_impl = AXIS2_INTF_TO_IMPL(date_time);
time = date_time_impl->utcTime;
Modified: webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h?rev=437970&r1=437969&r2=437970&view=diff
==============================================================================
--- webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h (original)
+++ webservices/axis2/trunk/c/xml_schema/include/xml_schema_obj_table.h Mon Aug 28 22:25:58 2006
@@ -17,14 +17,19 @@
#ifndef XML_SCHEMA_OBJ_TABLE_H
#define XML_SCHEMA_OBJ_TABLE_H
+/** @defgroup xml_schema_obj_table Xml Schema Obj Table
+ * @ingroup xml_schema
+ * @{
+ */
+
/**
* @file xml_schema_obj_table.h
- * @brief Axis2 Xml Schema Obj Table interface
- * A table class that provides read-only helpers for Xml Schema
- * Object objects. This class is used to provide the tables for
- * contained elements that are within the schema as tables that
- * are accessed from the Xml Schema class (for example, Attributes,
- * Attribute Groups, Elements, and so on).
+ * @brief xml_schema_obj_table collection
+ * xml_schema_collection is a collection interface that
+ * provides read-only helpers for xml_schema_obj structs.
+ * This is used to provide the tables for contained elements that
+ * are within the schema as tables that are accessed from the xml_schema functons
+ * (for example, Attributes, Attribute Groups, Elements, and so on).
*/
#include <axis2_allocator.h>
@@ -42,48 +47,84 @@
{
#endif
-typedef struct xml_schema_obj_table
- xml_schema_obj_table_t;
-typedef struct xml_schema_obj_table_ops
- xml_schema_obj_table_ops_t;
+/* Type name for struct xml_schema_obj_table */
+typedef struct xml_schema_obj_table xml_schema_obj_table_t;
+
+/* Type name for struct xml_schema_obj_table_ops */
+typedef struct xml_schema_obj_table_ops xml_schema_obj_table_ops_t;
-/** @defgroup xml_schema_obj_table Xml Schema Obj Table
- * @ingroup xml_schema
- * @{
- */
+/**
+ * struct xml_schema_obj_table_ops */
+
struct xml_schema_obj_table_ops
{
/**
- * Deallocate memory
- * @return status code
+ * Free xml_schema_obj_table struct
+ * When freing struct instances, whose references kept
+ * in the table are not freed.
+ * @param obj_table pointer to xml_schema_obj_table
+ * @param env environment struct
+ * @return AXIS2_SUCCESS on success, AXIS2_FAILURE on failure.
*/
axis2_status_t (AXIS2_CALL *
free)(
xml_schema_obj_table_t *obj_table,
const axis2_env_t *env);
-
+
+ /**
+ * Get number of elements in the table
+ * @param obj_table pointer to obj_table struct instance
+ * @param env environment
+ * @return Number of elements , 0 if no elements are present
+ */
int (AXIS2_CALL *
get_count)(
xml_schema_obj_table_t *obj_table,
const axis2_env_t *env);
-
+ /**
+ * Get an item in the table by giving matching qname
+ * @param obj_table pointer to obj_table struct instance
+ * @param env environment struct
+ * @param qname pointer to qname struct
+ */
void *(AXIS2_CALL *
get_item)(
xml_schema_obj_table_t *obj_table,
const axis2_env_t *env,
const axis2_qname_t *qname);
+ /**
+ * Get an array_list containing the qnames which
+ * are used as keys in the table
+ * @param obj_table pointer to xml_schema_obj_table struct instance
+ * @param env environment struct
+ * @returns axis2_array_list struct instance containing keys
+ */
axis2_array_list_t *(AXIS2_CALL *
get_names)(
xml_schema_obj_table_t *obj_table,
const axis2_env_t *env);
+ /**
+ * Get an array list of values stored in the table
+ * @param obj_table pointer struct xml_schema_obj_table
+ * @param env environment
+ * @returns array_list containing all values in the xml_schema_obj_table
+ * The returned values are read only and must not be modified
+ */
axis2_array_list_t *(AXIS2_CALL *
get_values)(
xml_schema_obj_table_t *obj_table,
const axis2_env_t *env);
+ /**
+ * Checks whether there is a value stored with a qiven qname
+ * @param obj_table pointer to xml_schema_obj_table
+ * @param env environment
+ * @param qname pointer to axis2_qname_t
+ * @returns AXIS2_TRUE if value exists, AXIS2_FALSE otherwise
+ */
axis2_bool_t (AXIS2_CALL *
contains)(
xml_schema_obj_table_t *obj_table,
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org