dbus/glib dbus-gmain.c,1.31,1.32

[Havoc Pennington]

Update of /cvs/dbus/dbus/glib
In directory gabe:/tmp/cvs-serv5614/glib

Modified Files:
	dbus-gmain.c 
Log Message:
2004-11-13  Havoc Pennington  <hp at redhat.com>

	* test/glib/test-profile.c: fix this thing up a bit

	* dbus/dbus-message.c (dbus_message_new_empty_header): increase
	preallocation sizes by a fair bit; not sure if this will be an
	overall performance win or not, but it does reduce reallocs.

	* dbus/dbus-string.c (set_length, reallocate_for_length): ignore
	the test hack that forced constant realloc if asserts are
	disabled, so we can profile sanely. Sprinkle in some
	_DBUS_UNLIKELY() which are probably pointless, but before I
	noticed the real performance problem I put them in.
	(_dbus_string_validate_utf8): micro-optimize this thing a little
	bit, though callgrind says it didn't help; then special-case
	ascii, which did help a lot; then be sure we detect nul bytes as
	invalid, which is a bugfix.
	(align_length_then_lengthen): add some more _DBUS_UNLIKELY
	superstition; use memset to nul the padding instead of a manual
	loop.
	(_dbus_string_get_length): inline this as a
	macro; it showed up in the profile because it's used for loop
	tests and so forth



Index: dbus-gmain.c
===================================================================
RCS file: /cvs/dbus/dbus/glib/dbus-gmain.c,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- dbus-gmain.c	7 Oct 2004 09:56:01 -0000	1.31
+++ dbus-gmain.c	13 Nov 2004 07:07:47 -0000	1.32
@@ -327,7 +327,7 @@
     return; /* probably a not-enabled watch that was added */
 
   watch_fd->removed = TRUE;
-  watch_fd->watch = NULL;  
+  watch_fd->watch = NULL;
   
   dbus_source->watch_fds = g_list_remove (dbus_source->watch_fds, watch_fd);
 
@@ -409,7 +409,7 @@
 
 static void
 free_source (GSource *source)
-{
+{  
   g_source_destroy (source);
 }