[asterisk-commits] twilson: trunk r323673 - in /trunk: ./ tests/test_db.c

[SVN commits to the Asterisk project]

Author: twilson
Date: Wed Jun 15 12:12:29 2011
New Revision: 323673

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=323673
Log:
Merged revisions 323672 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r323672 | twilson | 2011-06-15 10:09:51 -0700 (Wed, 15 Jun 2011) | 5 lines
  
  Cast ARRAY_LEN to size_t for ast_logging
  
  32-bit and 64-bit machines return different types for ARRAY_LEN(), so cast
  it before using in a format string.
........

Modified:
    trunk/   (props changed)
    trunk/tests/test_db.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.8-merged' - no diff available.

Modified: trunk/tests/test_db.c
URL: http://svnview.digium.com/svn/asterisk/trunk/tests/test_db.c?view=diff&rev=323673&r1=323672&r2=323673
==============================================================================
--- trunk/tests/test_db.c (original)
+++ trunk/tests/test_db.c Wed Jun 15 12:12:29 2011
@@ -193,12 +193,12 @@
 	ast_db_freetree(dbes);
 
 	if ((num_deleted = ast_db_deltree(BASE, SUB2)) != ARRAY_LEN(inputs) / 2) {
-		ast_test_status_update(test, "Failed to deltree %s/%s, expected %lu deletions and got %d\n", BASE, SUB2, ARRAY_LEN(inputs) / 2, num_deleted);
+		ast_test_status_update(test, "Failed to deltree %s/%s, expected %zu deletions and got %d\n", BASE, SUB2, (size_t) ARRAY_LEN(inputs) / 2, num_deleted);
 		res = AST_TEST_FAIL;
 	}
 
 	if ((num_deleted = ast_db_deltree(BASE, NULL)) != ARRAY_LEN(inputs) / 2) {
-		ast_test_status_update(test, "Failed to deltree %s, expected %lu deletions and got %d\n", BASE, ARRAY_LEN(inputs) / 2, num_deleted);
+		ast_test_status_update(test, "Failed to deltree %s, expected %zu deletions and got %d\n", BASE, (size_t) ARRAY_LEN(inputs) / 2, num_deleted);
 		res = AST_TEST_FAIL;
 	}