2003-01-27 Havoc Pennington <hp@pobox.com>

	* dbus/dbus-mempool.c (time_for_size): replace printf with
	_dbus_verbose

	* dbus/dbus-message-builder.c (_dbus_message_data_load): allow
	empty lines; fix the SAVE_LENGTH stuff to be
	START_LENGTH/END_LENGTH so it actually works; couple other
	bugfixes

	* test/Makefile.am (dist-hook): add dist-hook for .message files

	* dbus/dbus-string.c (DBUS_STRING_COPY_PREAMBLE): source of a copy
	can be constant or locked.
	(_dbus_string_free): allow freeing a const string as
	documented/intended

	* dbus/dbus-sysdeps.c (_dbus_concat_dir_and_file): utility

	* dbus/dbus-test-main.c (main): take an argument which is the
	directory containing test data

	* dbus/dbus-message.c (_dbus_message_test): pass a test_data_dir
	argument to this and load all the messages in test/data/
	checking that they can be loaded or not loaded as appropriate.

1 files changed, 13 insertions, 13 deletions

diff --git a/dbus/dbus-mempool.c b/dbus/dbus-mempool.c
index a3aa086d..05e3749b 100644
--- a/dbus/dbus-mempool.c
+++ b/dbus/dbus-mempool.c
@@ -285,9 +285,9 @@ time_for_size (int size)
   void *to_free[FREE_ARRAY_SIZE];
   DBusMemPool *pool;
 
-  printf ("Timings for size %d\n", size);
+  _dbus_verbose ("Timings for size %d\n", size);
   
-  printf (" malloc\n");
+  _dbus_verbose (" malloc\n");
   
   start = clock ();
   
@@ -317,12 +317,12 @@ time_for_size (int size)
 
   end = clock ();
 
-  printf ("  created/destroyed %d elements in %g seconds\n",
-          N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
+  _dbus_verbose ("  created/destroyed %d elements in %g seconds\n",
+                 N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
 
 
 
-  printf (" mempools\n");
+  _dbus_verbose (" mempools\n");
   
   start = clock ();
 
@@ -356,10 +356,10 @@ time_for_size (int size)
   
   end = clock ();
 
-  printf ("  created/destroyed %d elements in %g seconds\n",
-          N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
+  _dbus_verbose ("  created/destroyed %d elements in %g seconds\n",
+                 N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
 
-  printf (" zeroed malloc\n");
+  _dbus_verbose (" zeroed malloc\n");
     
   start = clock ();
   
@@ -389,10 +389,10 @@ time_for_size (int size)
 
   end = clock ();
 
-  printf ("  created/destroyed %d elements in %g seconds\n",
-          N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
+  _dbus_verbose ("  created/destroyed %d elements in %g seconds\n",
+                 N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
   
-  printf (" zeroed mempools\n");
+  _dbus_verbose (" zeroed mempools\n");
   
   start = clock ();
 
@@ -426,8 +426,8 @@ time_for_size (int size)
   
   end = clock ();
 
-  printf ("  created/destroyed %d elements in %g seconds\n",
-          N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
+  _dbus_verbose ("  created/destroyed %d elements in %g seconds\n",
+                 N_ITERATIONS, (end - start) / (double) CLOCKS_PER_SEC);
 }
 
 /**