Mercurial > hg > waaad
changeset 294:405197e4db76
Fixed variable name conflict in extension
| author | Sebastien Decugis <sdecugis@nict.go.jp> |
|---|---|
| date | Mon, 22 Dec 2008 13:35:11 +0900 |
| parents | aa6883dd5191 |
| children | cdf10ce8e08d |
| files | extensions/app_test/atst_cli.c waaad/dispatch.c |
| diffstat | 2 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/extensions/app_test/atst_cli.c Mon Dec 22 13:23:48 2008 +0900 +++ b/extensions/app_test/atst_cli.c Mon Dec 22 13:35:11 2008 +0900 @@ -60,13 +60,13 @@ { sess_id_t *sess = NULL; msg_avp_t * src = NULL; - msg_avp_data_t * data = NULL; + msg_avp_data_t * avpdata = NULL; int new; CHECK_VOID( msg_search_avp(*msg, sess_id, &src) ); - CHECK_VOID( msg_avp_data( src, &data ) ); + CHECK_VOID( msg_avp_data( src, &avpdata ) ); - CHECK_VOID( sess_fromsid( (char *)data->avp_data->os.data, data->avp_data->os.len, &sess, &new) ); + CHECK_VOID( sess_fromsid( (char *)avpdata->avp_data->os.data, avpdata->avp_data->os.len, &sess, &new) ); ASSERT( new == 0 ); CHECK_VOID( sess_data_dereg( sess, cli_reg, (void *)&mi) ); @@ -84,12 +84,12 @@ /* Value of Test-AVP */ { msg_avp_t * src = NULL; - msg_avp_data_t * data = NULL; + msg_avp_data_t * avpdata = NULL; CHECK_VOID( msg_search_avp(*msg, atst_avp, &src) ); if (src) { - CHECK_VOID( msg_avp_data( src, &data ) ); - fprintf(stderr, "%x (%s) ", data->avp_data->i32, (data->avp_data->i32 == mi->randval) ? "Ok" : "PROBLEM"); + CHECK_VOID( msg_avp_data( src, &avpdata ) ); + fprintf(stderr, "%x (%s) ", avpdata->avp_data->i32, (avpdata->avp_data->i32 == mi->randval) ? "Ok" : "PROBLEM"); } else { fprintf(stderr, "no_Test-AVP "); } @@ -98,12 +98,12 @@ /* Value of Result Code */ { msg_avp_t * src = NULL; - msg_avp_data_t * data = NULL; + msg_avp_data_t * avpdata = NULL; CHECK_VOID( msg_search_avp(*msg, res_code, &src) ); if (src) { - CHECK_VOID( msg_avp_data( src, &data ) ); - fprintf(stderr, "Status: %d ", data->avp_data->i32); + CHECK_VOID( msg_avp_data( src, &avpdata ) ); + fprintf(stderr, "Status: %d ", avpdata->avp_data->i32); } else { fprintf(stderr, "no_Result-Code "); } @@ -112,15 +112,15 @@ /* Value of Origin-Host */ { msg_avp_t * src = NULL; - msg_avp_data_t * data = NULL; + msg_avp_data_t * avpdata = NULL; CHECK_VOID( msg_search_avp(*msg, origin_host, &src) ); if (src) { char * str; - CHECK_VOID( msg_avp_data( src, &data ) ); - str = malloc(data->avp_data->os.len + 1); - memcpy(str, data->avp_data->os.data, data->avp_data->os.len); - str[data->avp_data->os.len] = '\0'; + CHECK_VOID( msg_avp_data( src, &avpdata ) ); + str = malloc(avpdata->avp_data->os.len + 1); + memcpy(str, avpdata->avp_data->os.data, avpdata->avp_data->os.len); + str[avpdata->avp_data->os.len] = '\0'; fprintf(stderr, "From '%s' ", str); free(str); } else { @@ -131,15 +131,15 @@ /* Value of Origin-Realm */ { msg_avp_t * src = NULL; - msg_avp_data_t * data = NULL; + msg_avp_data_t * avpdata = NULL; CHECK_VOID( msg_search_avp(*msg, origin_realm, &src) ); if (src) { char * str; - CHECK_VOID( msg_avp_data( src, &data ) ); - str = malloc(data->avp_data->os.len + 1); - memcpy(str, data->avp_data->os.data, data->avp_data->os.len); - str[data->avp_data->os.len] = '\0'; + CHECK_VOID( msg_avp_data( src, &avpdata ) ); + str = malloc(avpdata->avp_data->os.len + 1); + memcpy(str, avpdata->avp_data->os.data, avpdata->avp_data->os.len); + str[avpdata->avp_data->os.len] = '\0'; fprintf(stderr, "('%s') ", str); free(str); } else {
--- a/waaad/dispatch.c Mon Dec 22 13:23:48 2008 +0900 +++ b/waaad/dispatch.c Mon Dec 22 13:35:11 2008 +0900 @@ -161,7 +161,7 @@ /* If a callback was registered, pass the message to it */ if (anscb != NULL) { - TRACE_DEBUG(FULL, "Calling callback registered when query was sent"); + TRACE_DEBUG(FULL, "Calling callback registered when query was sent (%p, %p)", anscb, data); (*anscb)(data, &msg); if (msg == NULL) {