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 di...@apache.org on 2007/03/07 11:31:19 UTC
svn commit: r515519 - in /webservices/axis2/trunk/c: rampart/src/util/
samples/codegen/client/interop_doc1/ samples/codegen/server/interop_doc1/
util/include/ util/src/
Author: dinesh
Date: Wed Mar 7 02:31:18 2007
New Revision: 515519
URL: http://svn.apache.org/viewvc?view=rev&rev=515519
Log:
removed macro from date_time functions
Modified:
webservices/axis2/trunk/c/rampart/src/util/rampart_util.c
webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c
webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c
webservices/axis2/trunk/c/util/include/axis2_date_time.h
webservices/axis2/trunk/c/util/src/rand.c
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_util.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_util.c?view=diff&rev=515519&r1=515518&r2=515519
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_util.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_util.c Wed Mar 7 02:31:18 2007
@@ -196,8 +196,8 @@
axis2_char_t *dt_str = NULL;
dt = axis2_date_time_create_with_offset(env, ttl);
- dt_str = AXIS2_DATE_TIME_SERIALIZE_DATE_TIME(dt, env);
- AXIS2_DATE_TIME_FREE(dt, env);
+ dt_str = axis2_date_time_seriasize_date_time(dt, env);
+ axis2_date_time_free(dt, env);
return dt_str;
}
@@ -215,33 +215,33 @@
dt1 = axis2_date_time_create(env);
dt2 = axis2_date_time_create(env);
- status = AXIS2_DATE_TIME_DESERIALIZE_DATE_TIME(dt1, env, dt1_str);
+ status = axis2_date_time_deseriasize_date_TIME(dt1, env, dt1_str);
if (status == AXIS2_FAILURE)
{
return AXIS2_FAILURE;
}
- yyyy1 = AXIS2_DATE_TIME_GET_YEAR(dt1, env);
- mm1 = AXIS2_DATE_TIME_GET_MONTH(dt1, env);
- dd1 = AXIS2_DATE_TIME_GET_DATE(dt1, env);
- hh1 = AXIS2_DATE_TIME_GET_HOUR(dt1, env);
- mi1 = AXIS2_DATE_TIME_GET_MINUTE(dt1, env);
- ss1 = AXIS2_DATE_TIME_GET_SECOND(dt1, env);
- ml1 = AXIS2_DATE_TIME_GET_MSEC(dt1, env);
+ yyyy1 = axis2_date_time_get_year(dt1, env);
+ mm1 = axis2_date_time_get_month(dt1, env);
+ dd1 = axis2_date_time_get_date(dt1, env);
+ hh1 = axis2_date_time_get_hour(dt1, env);
+ mi1 = axis2_date_time_get_minute(dt1, env);
+ ss1 = axis2_date_time_get_second(dt1, env);
+ ml1 = axis2_date_time_get_msec(dt1, env);
- status = AXIS2_DATE_TIME_DESERIALIZE_DATE_TIME(dt2, env, dt2_str);
+ status = axis2_date_time_deseriasize_date_TIME(dt2, env, dt2_str);
if (status == AXIS2_FAILURE)
{
return AXIS2_FAILURE;
}
- yyyy2 = AXIS2_DATE_TIME_GET_YEAR(dt2, env);
- mm2 = AXIS2_DATE_TIME_GET_MONTH(dt2, env);
- dd2 = AXIS2_DATE_TIME_GET_DATE(dt2, env);
- hh2 = AXIS2_DATE_TIME_GET_HOUR(dt2, env);
- mi2 = AXIS2_DATE_TIME_GET_MINUTE(dt2, env);
- ss2 = AXIS2_DATE_TIME_GET_SECOND(dt2, env);
- ml2 = AXIS2_DATE_TIME_GET_MSEC(dt2, env);
+ yyyy2 = axis2_date_time_get_year(dt2, env);
+ mm2 = axis2_date_time_get_month(dt2, env);
+ dd2 = axis2_date_time_get_date(dt2, env);
+ hh2 = axis2_date_time_get_hour(dt2, env);
+ mi2 = axis2_date_time_get_minute(dt2, env);
+ ss2 = axis2_date_time_get_second(dt2, env);
+ ml2 = axis2_date_time_get_msec(dt2, env);
/**
Comparison.
We expect dt1_str < dt2_str/ Otherwise FAILURE
@@ -308,8 +308,8 @@
return AXIS2_FAILURE;
}
- /*AXIS2_DATE_TIME_FREE(dt1, env);
- AXIS2_DATE_TIME_FREE(dt2, env);*/
+ /*axis2_date_time_free(dt1, env);
+ axis2_date_time_free(dt2, env);*/
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c?view=diff&rev=515519&r1=515518&r2=515519
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c (original)
+++ webservices/axis2/trunk/c/samples/codegen/client/interop_doc1/test_echo_date.c Wed Mar 7 02:31:18 2007
@@ -52,7 +52,7 @@
/* create the struct */
echo_date = axis2_date_time_create(env); /* default to current date */
- send_date_str = AXIS2_DATE_TIME_SERIALIZE_DATE_TIME(echo_date, env);
+ send_date_str = axis2_date_time_seriasize_date_time(echo_date, env);
printf("sending date %s\n", send_date_str);
/* create the input params using databinding */
@@ -65,7 +65,7 @@
/* return the output params using databinding */
return_echo_date = AXIS2_ECHODATERESPONSE_GET_ECHODATERETURN(echo_out, env);
- return_date_str = AXIS2_DATE_TIME_SERIALIZE_DATE_TIME(return_echo_date, env);
+ return_date_str = axis2_date_time_seriasize_date_time(return_echo_date, env);
printf("returned date %s\n", return_date_str);
return 0;
Modified: webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c?view=diff&rev=515519&r1=515518&r2=515519
==============================================================================
--- webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c (original)
+++ webservices/axis2/trunk/c/samples/codegen/server/interop_doc1/axis2_InteropTestPortTypeDocService.c Wed Mar 7 02:31:18 2007
@@ -76,7 +76,7 @@
echo_date = AXIS2_ECHODATE_GET_ARG_0_10(echo_in, env);
- recieved_date_str = AXIS2_DATE_TIME_SERIALIZE_DATE_TIME(echo_date, env);
+ recieved_date_str = axis2_date_time_seriasize_date_time(echo_date, env);
printf("echoing date %s\n", recieved_date_str);
echo_out = axis2_echoDateResponse_create(env);
Modified: webservices/axis2/trunk/c/util/include/axis2_date_time.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/include/axis2_date_time.h?view=diff&rev=515519&r1=515518&r2=515519
==============================================================================
--- webservices/axis2/trunk/c/util/include/axis2_date_time.h (original)
+++ webservices/axis2/trunk/c/util/include/axis2_date_time.h Wed Mar 7 02:31:18 2007
@@ -217,56 +217,6 @@
axis2_date_time_get_msec(axis2_date_time_t *date_time,
const axis2_env_t *env);
-
-#define AXIS2_DATE_TIME_FREE(date_time, env) \
- axis2_date_time_free (date_time, env)
-
-#define AXIS2_DATE_TIME_DESERIALIZE_TIME(date_time, env, time) \
- axis2_date_time_deserialize_time (date_time, env, time)
-
-#define AXIS2_DATE_TIME_DESERIALIZE_DATE(date_time, env, date) \
- axis2_date_time_deserialize_date (date_time, env, date_str)
-
-#define AXIS2_DATE_TIME_DESERIALIZE_DATE_TIME(date_time, env, date_time_str) \
- axis2_date_time_deserialize_date_time(date_time, env, date_time_str)
-
-#define AXIS2_DATE_TIME_SET_DATE_TIME(date_time, env, \
- year, month, date, hour, min, second, milliseconds) \
- axis2_date_time_set_date_time (date_time, env, \
- year, month, date, hour, min, second, milliseconds)
-
-#define AXIS2_DATE_TIME_SERIALIZE_TIME(date_time, env) \
- axis2_date_time_serialize_time (date_time, env)
-
-#define AXIS2_DATE_TIME_SERIALIZE_DATE(date_time, env) \
- axis2_date_time_serialize_date (date_time, env)
-
-#define AXIS2_DATE_TIME_SERIALIZE_DATE_TIME(date_time, env) \
- axis2_date_time_serialize_date_time (date_time, env)
-
-#define AXIS2_DATE_TIME_GET_YEAR(date_time, env) \
- axis2_date_time_get_year(date_time, env)
-
-#define AXIS2_DATE_TIME_GET_MONTH(date_time, env) \
- axis2_date_time_get_month(date_time, env)
-
-#define AXIS2_DATE_TIME_GET_DATE(date_time, env) \
- axis2_date_time_get_date(date_time, env)
-
-#define AXIS2_DATE_TIME_GET_HOUR(date_time, env) \
- axis2_date_time_get_hour(date_time, env)
-
-#define AXIS2_DATE_TIME_GET_MINUTE(date_time, env) \
- axis2_date_time_get_minute(date_time, env)
-
-#define AXIS2_DATE_TIME_GET_SECOND(date_time, env) \
- axis2_date_time_get_second(date_time, env)
-
-#define AXIS2_DATE_TIME_GET_MSEC(date_time, env) \
- axis2_date_time_get_msec(date_time, env)
-
- /** @} */
-
#ifdef __cplusplus
}
#endif
Modified: webservices/axis2/trunk/c/util/src/rand.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/util/src/rand.c?view=diff&rev=515519&r1=515518&r2=515519
==============================================================================
--- webservices/axis2/trunk/c/util/src/rand.c (original)
+++ webservices/axis2/trunk/c/util/src/rand.c Wed Mar 7 02:31:18 2007
@@ -52,12 +52,12 @@
const axis2_env_t *env)
{
axis2_date_time_t *date = axis2_date_time_create(env);
- unsigned int rand_var = AXIS2_DATE_TIME_GET_YEAR(date, env);
- rand_var += AXIS2_DATE_TIME_GET_MONTH(date, env);
- rand_var += AXIS2_DATE_TIME_GET_DATE(date, env);
- rand_var += AXIS2_DATE_TIME_GET_HOUR(date, env);
- rand_var += AXIS2_DATE_TIME_GET_MINUTE(date, env);
- rand_var += AXIS2_DATE_TIME_GET_SECOND(date, env);
+ unsigned int rand_var = axis2_date_time_get_year(date, env);
+ rand_var += axis2_date_time_get_month(date, env);
+ rand_var += axis2_date_time_get_date(date, env);
+ rand_var += axis2_date_time_get_hour(date, env);
+ rand_var += axis2_date_time_get_minute(date, env);
+ rand_var += axis2_date_time_get_second(date, env);
return rand_var;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org