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 se...@apache.org on 2008/02/23 16:40:57 UTC
svn commit: r630453 - in /webservices/axis2/trunk/c: include/
src/core/clientapi/ src/core/transport/http/sender/
src/core/transport/http/server/IIS/ util/include/platforms/windows/
Author: senaka
Date: Sat Feb 23 07:40:56 2008
New Revision: 630453
URL: http://svn.apache.org/viewvc?rev=630453&view=rev
Log:
Fixing build break due to C++ comments in code and removing other occurences of such.
Modified:
webservices/axis2/trunk/c/include/axis2_callback.h
webservices/axis2/trunk/c/include/axis2_svc.h
webservices/axis2/trunk/c/src/core/clientapi/options.c
webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c
webservices/axis2/trunk/c/src/core/transport/http/server/IIS/axis2_iis_constants.h
webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h
Modified: webservices/axis2/trunk/c/include/axis2_callback.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_callback.h?rev=630453&r1=630452&r2=630453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_callback.h (original)
+++ webservices/axis2/trunk/c/include/axis2_callback.h Sat Feb 23 07:40:56 2008
@@ -95,11 +95,11 @@
* <code>
* <pre>
* while(!AXIS2_CALL
- BACK_GET_COMPLETE(callback, env)
+ * BACK_GET_COMPLETE(callback, env)
* {
* sleep(10);
* }
- * // do whatever you need here
+ * do whatever you need here
* </pre>
* </code>
* @param callback pointer to callback struct
Modified: webservices/axis2/trunk/c/include/axis2_svc.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/include/axis2_svc.h?rev=630453&r1=630452&r2=630453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/include/axis2_svc.h (original)
+++ webservices/axis2/trunk/c/include/axis2_svc.h Sat Feb 23 07:40:56 2008
@@ -790,7 +790,8 @@
* @param table pointer to hash map with XML schema mappings, service
* assumes ownership of the map
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- *//*
+ */
+ /*
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_svc_set_schema_mapping_table(
@@ -803,7 +804,8 @@
* @param svc pointer to service struct
* @param env pointer to environment struct
* @return custom schema prefix string
- *//*
+ */
+ /*
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
axis2_svc_get_custom_schema_prefix(
@@ -816,7 +818,8 @@
* @param env pointer to environment struct
* @param prefix custom schema prefix string
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- *//*
+ */
+ /*
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_svc_set_custom_schema_prefix(
@@ -858,7 +861,8 @@
* @param env pointer to environment struct
* @param out_stream stream to print to
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- *//*
+ */
+ /*
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_svc_print_schema(
@@ -934,7 +938,8 @@
* @param env pointer to environment struct
* @param schemas pointer to array list containing XML schemas
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- *//*
+ */
+ /*
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_svc_add_all_schemas(
@@ -947,7 +952,8 @@
* @param svc pointer to service struct
* @param env pointer to environment struct
* @return XML schema target namespace string
- *//*
+ */
+ /*
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
axis2_svc_get_schema_target_ns(
@@ -960,7 +966,8 @@
* @param env pointer to environment struct
* @param ns namespace string
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- *//*
+ */
+ /*
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_svc_set_schema_target_ns(
@@ -973,7 +980,8 @@
* @param svc pointer to service struct
* @param env pointer to environment struct
* @return XML schema target namespace prefix string
- *//*
+ */
+ /*
AXIS2_EXTERN const axis2_char_t *AXIS2_CALL
axis2_svc_get_schema_target_ns_prefix(
@@ -986,7 +994,8 @@
* @param env pointer to environment struct
* @param prefix namespace prefix string
* @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- *//*
+ */
+ /*
AXIS2_EXTERN axis2_status_t AXIS2_CALL
axis2_svc_set_schema_target_ns_prefix(
Modified: webservices/axis2/trunk/c/src/core/clientapi/options.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/clientapi/options.c?rev=630453&r1=630452&r2=630453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/clientapi/options.c (original)
+++ webservices/axis2/trunk/c/src/core/clientapi/options.c Sat Feb 23 07:40:56 2008
@@ -627,10 +627,12 @@
const long timeout_in_milli_seconds)
{
options->timeout_in_milli_seconds = timeout_in_milli_seconds;
- // set the property AXIS2_HTTP_CONNECTION_TIMEOUT, to be picked up by http_sender
+ /* set the property AXIS2_HTTP_CONNECTION_TIMEOUT,
+ * to be picked up by http_sender
+ */
if (options->timeout_in_milli_seconds > 0)
{
- axis2_char_t time_str[19]; // supports 18 digit timeout
+ axis2_char_t time_str[19]; /* supports 18 digit timeout */
axutil_property_t *property = axutil_property_create(env);
sprintf(time_str, "%ld", options->timeout_in_milli_seconds);
if (property)
Modified: webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c?rev=630453&r1=630452&r2=630453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/sender/http_sender.c Sat Feb 23 07:40:56 2008
@@ -1360,8 +1360,9 @@
AXIS2_ENV_CHECK (env, AXIS2_FAILURE);
- // ckeck if timeout has been set by user using options
- // with axis2_options_set_timeout_in_milli_seconds
+ /* check if timeout has been set by user using options
+ * with axis2_options_set_timeout_in_milli_seconds
+ */
property =
axis2_msg_ctx_get_property(msg_ctx, env, AXIS2_HTTP_CONNECTION_TIMEOUT);
if (property)
Modified: webservices/axis2/trunk/c/src/core/transport/http/server/IIS/axis2_iis_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/src/core/transport/http/server/IIS/axis2_iis_constants.h?rev=630453&r1=630452&r2=630453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/src/core/transport/http/server/IIS/axis2_iis_constants.h (original)
+++ webservices/axis2/trunk/c/src/core/transport/http/server/IIS/axis2_iis_constants.h Sat Feb 23 07:40:56 2008
@@ -20,7 +20,7 @@
#define AXIS2_IIS_CONSTANTS_H
#define INTERNET_MAX_PATH_LENGTH 2048
-#define INTERNET_MAX_SCHEME_LENGTH 32 // longest protocol name length
+#define INTERNET_MAX_SCHEME_LENGTH 32 /* longest protocol name length */
#define INTERNET_MAX_URL_LENGTH (INTERNET_MAX_SCHEME_LENGTH +sizeof("://") +INTERNET_MAX_PATH_LENGTH)
#define URI_MATCHED 1
Modified: webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h?rev=630453&r1=630452&r2=630453&view=diff
==============================================================================
--- webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h (original)
+++ webservices/axis2/trunk/c/util/include/platforms/windows/axutil_windows.h Sat Feb 23 07:40:56 2008
@@ -85,11 +85,13 @@
*/
#define AXIS2_CONFIGURATION_RESOURCE "" /* should be set */
-// =============================================================
-// Library loading and procedure resolution
-// =============================================================
+/*
+ * =============================================================
+ * Library loading and procedure resolution
+ * =============================================================
+ */
#define DLHandler HINSTANCE
-#define RTLD_LAZY 0 // not sure this is needed?
+#define RTLD_LAZY 0 /* not sure this is needed? */
#define AXIS2_PLATFORM_LOADLIBINIT()
#define AXIS2_PLATFORM_LOADLIB(_lib) /*LoadLibrary(_lib) */ callLoadLib(_lib)
@@ -100,19 +102,25 @@
#define AXIS2_DLHANDLER void*
-// =============================================================
-// National Language Support
-// =============================================================
+/*
+ * =============================================================
+ * National Language Support
+ * =============================================================
+ */
-// STRTOASC is to translate single byte 'native' character representation to ASCII
-// ASCTOSTR is to translate single byte ascii representation to 'native' character
-// CANNOT be used with constants
+/*
+ * STRTOASC is to translate single byte 'native' character representation to ASCII
+ * ASCTOSTR is to translate single byte ascii representation to 'native' character
+ * CANNOT be used with constants
+ */
#define AXIS2_PLATFORM_STRTOASC( x ) ( x )
#define AXIS2_PLATFORM_ASCTOSTR( x ) ( x )
-// =============================================================
-// Miscellaneous
-// =============================================================
+/*
+ * =============================================================
+ * Miscellaneous
+ * =============================================================
+ */
#define AXIS2_STRRCHR(x, y) (strrchr(x, y))
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org