[svn-commits] kmoore: branch 11 r416733 - in /branches/11: ./ channels/sip/ main/
SVN commits to the Digium repositories
svn-commits at lists.digium.com
Thu Jun 19 14:34:41 CDT 2014
Author: kmoore
Date: Thu Jun 19 14:34:37 2014
New Revision: 416733
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=416733
Log:
Fix build warnings with TEST_FRAMEWORK enabled
........
Merged revisions 416732 from http://svn.asterisk.org/svn/asterisk/branches/1.8
Modified:
branches/11/ (props changed)
branches/11/channels/sip/reqresp_parser.c
branches/11/main/bridging.c
branches/11/main/logger.c
branches/11/main/test.c
Propchange: branches/11/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.
Modified: branches/11/channels/sip/reqresp_parser.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/channels/sip/reqresp_parser.c?view=diff&rev=416733&r1=416732&r2=416733
==============================================================================
--- branches/11/channels/sip/reqresp_parser.c (original)
+++ branches/11/channels/sip/reqresp_parser.c Thu Jun 19 14:34:37 2014
@@ -2489,8 +2489,8 @@
if (testdataptr->expected_port && testdataptr->expected_port != via->port) {
ast_test_status_update(test, "TEST#%d FAILED: VIA = \"%s\"\n"
- "parsed port = \"%d\"\n"
- "expected = \"%d\"\n"
+ "parsed port = \"%u\"\n"
+ "expected = \"%u\"\n"
"failed to parse port\n",
i, testdataptr->in, via->port, testdataptr->expected_port);
res = AST_TEST_FAIL;
Modified: branches/11/main/bridging.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/bridging.c?view=diff&rev=416733&r1=416732&r2=416733
==============================================================================
--- branches/11/main/bridging.c (original)
+++ branches/11/main/bridging.c Thu Jun 19 14:34:37 2014
@@ -1540,7 +1540,7 @@
cleanup_video_mode(bridge);
bridge->video_mode.mode = AST_BRIDGE_VIDEO_MODE_SINGLE_SRC;
bridge->video_mode.mode_data.single_src_data.chan_vsrc = ast_channel_ref(video_src_chan);
- ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to single source\r\nVideo Mode: %d\r\nVideo Channel: %s", bridge->video_mode.mode, ast_channel_name(video_src_chan));
+ ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to single source\r\nVideo Mode: %u\r\nVideo Channel: %s", bridge->video_mode.mode, ast_channel_name(video_src_chan));
ast_indicate(video_src_chan, AST_CONTROL_VIDUPDATE);
ao2_unlock(bridge);
}
@@ -1550,7 +1550,7 @@
ao2_lock(bridge);
cleanup_video_mode(bridge);
bridge->video_mode.mode = AST_BRIDGE_VIDEO_MODE_TALKER_SRC;
- ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to talker source\r\nVideo Mode: %d", bridge->video_mode.mode);
+ ast_test_suite_event_notify("BRIDGE_VIDEO_MODE", "Message: video mode set to talker source\r\nVideo Mode: %u", bridge->video_mode.mode);
ao2_unlock(bridge);
}
Modified: branches/11/main/logger.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/logger.c?view=diff&rev=416733&r1=416732&r2=416733
==============================================================================
--- branches/11/main/logger.c (original)
+++ branches/11/main/logger.c Thu Jun 19 14:34:37 2014
@@ -1327,7 +1327,7 @@
call->call_identifier = ast_atomic_fetchadd_int(&next_unique_callid, +1);
#ifdef TEST_FRAMEWORK
- ast_debug(3, "CALL_ID [C-%08x] created by thread.\n", call->call_identifier);
+ ast_debug(3, "CALL_ID [C-%08x] created by thread.\n", (unsigned)call->call_identifier);
#endif
return call;
}
@@ -1357,7 +1357,7 @@
if (*id && (*id != callid)) {
#ifdef TEST_FRAMEWORK
- ast_debug(3, "CALL_ID [C-%08x] being removed from thread.\n", (*id)->call_identifier);
+ ast_debug(3, "CALL_ID [C-%08x] being removed from thread.\n", (unsigned)(*id)->call_identifier);
#endif
*id = ast_callid_unref(*id);
*id = NULL;
@@ -1368,7 +1368,7 @@
ast_callid_ref(callid);
*id = callid;
#ifdef TEST_FRAMEWORK
- ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", callid->call_identifier);
+ ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", (unsigned)callid->call_identifier);
#endif
}
@@ -1390,7 +1390,7 @@
ast_callid_ref(callid);
*pointing = callid;
#ifdef TEST_FRAMEWORK
- ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", callid->call_identifier);
+ ast_debug(3, "CALL_ID [C-%08x] bound to thread.\n", (unsigned)callid->call_identifier);
#endif
} else {
ast_log(LOG_WARNING, "Attempted to ast_callid_threadassoc_add on thread already associated with a callid.\n");
@@ -1415,7 +1415,7 @@
return -1;
} else {
#ifdef TEST_FRAMEWORK
- ast_debug(3, "Call_ID [C-%08x] being removed from thread.\n", (*pointing)->call_identifier);
+ ast_debug(3, "Call_ID [C-%08x] being removed from thread.\n", (unsigned)(*pointing)->call_identifier);
#endif
*pointing = ast_callid_unref(*pointing);
return 0;
Modified: branches/11/main/test.c
URL: http://svnview.digium.com/svn/asterisk/branches/11/main/test.c?view=diff&rev=416733&r1=416732&r2=416733
==============================================================================
--- branches/11/main/test.c (original)
+++ branches/11/main/test.c Thu Jun 19 14:34:37 2014
@@ -185,7 +185,7 @@
return;
}
- fprintf(f, "\t<testcase time=\"%d.%d\" name=\"%s%s\"%s>\n",
+ fprintf(f, "\t<testcase time=\"%u.%u\" name=\"%s%s\"%s>\n",
test->time / 1000, test->time % 1000,
test->info.category, test->info.name,
test->state == AST_TEST_PASS ? "/" : "");
@@ -210,7 +210,7 @@
fprintf(f, "Description: %s\n", test->info.description);
fprintf(f, "Result: %s\n", test_result2str[test->state]);
if (test->state != AST_TEST_NOT_RUN) {
- fprintf(f, "Time: %d\n", test->time);
+ fprintf(f, "Time: %u\n", test->time);
}
if (test->state == AST_TEST_FAIL) {
fprintf(f, "Error Description: %s\n\n", S_OR(ast_str_buffer(test->status_str), "NA"));
@@ -296,7 +296,7 @@
(test->state == AST_TEST_FAIL) ? COLOR_RED : COLOR_GREEN,
0,
sizeof(result_buf));
- ast_cli(cli->fd, "END %s - %s Time: %s%dms Result: %s\n",
+ ast_cli(cli->fd, "END %s - %s Time: %s%ums Result: %s\n",
test->info.category,
test->info.name,
test->time ? "" : "<",
@@ -385,7 +385,7 @@
* http://confluence.atlassian.com/display/BAMBOO/JUnit+parsing+in+Bamboo
*/
fprintf(f_xml, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
- fprintf(f_xml, "<testsuite errors=\"0\" time=\"%d.%d\" tests=\"%d\" "
+ fprintf(f_xml, "<testsuite errors=\"0\" time=\"%u.%u\" tests=\"%u\" "
"name=\"AsteriskUnitTests\">\n",
last_results.total_time / 1000, last_results.total_time % 1000,
last_results.total_tests);
@@ -398,11 +398,11 @@
if (f_txt) {
fprintf(f_txt, "Asterisk Version: %s\n", ast_get_version());
fprintf(f_txt, "Asterisk Version Number: %s\n", ast_get_version_num());
- fprintf(f_txt, "Number of Tests: %d\n", last_results.total_tests);
- fprintf(f_txt, "Number of Tests Executed: %d\n", (last_results.total_passed + last_results.total_failed));
- fprintf(f_txt, "Passed Tests: %d\n", last_results.total_passed);
- fprintf(f_txt, "Failed Tests: %d\n", last_results.total_failed);
- fprintf(f_txt, "Total Execution Time: %d\n", last_results.total_time);
+ fprintf(f_txt, "Number of Tests: %u\n", last_results.total_tests);
+ fprintf(f_txt, "Number of Tests Executed: %u\n", (last_results.total_passed + last_results.total_failed));
+ fprintf(f_txt, "Passed Tests: %u\n", last_results.total_passed);
+ fprintf(f_txt, "Failed Tests: %u\n", last_results.total_failed);
+ fprintf(f_txt, "Total Execution Time: %u\n", last_results.total_time);
}
/* export each individual test */
@@ -728,7 +728,7 @@
if (!(last_results.last_passed + last_results.last_failed)) {
ast_cli(a->fd, "--- No Tests Found! ---\n");
}
- ast_cli(a->fd, "\n%d Test(s) Executed %d Passed %d Failed\n",
+ ast_cli(a->fd, "\n%u Test(s) Executed %u Passed %u Failed\n",
(last_results.last_passed + last_results.last_failed),
last_results.last_passed,
last_results.last_failed);
More information about the svn-commits
mailing list