dbus/dbus dbus-string.c, 1.71, 1.72 dbus-sysdeps.c, 1.104, 1.105 dbus-sysdeps.h, 1.51, 1.52

[John Palmieri]

Update of /cvs/dbus/dbus/dbus
In directory kemper:/tmp/cvs-serv8965/dbus

Modified Files:
	dbus-string.c dbus-sysdeps.c dbus-sysdeps.h 
Log Message:
* dbus/dbus-sysdeps.h:
* dbus/dbus-sysdeps.c: 
* dbus/dbus-string.c: 
  s/_dbus_printf_length/_dbus_printf_string_upper_bound to comform with
  GLib's function which does the same thing

* configure.in:
* bus/Makefile.am:
* bus/dir-watch-default.c:
* bus/dir-watch-dnotify.c:
* bus/dir-watch-kqueue.c:
  Add kqueue directory watching for freebsd and split the directory
  watching code into seperate files per method/arch
  (patches from Timothy Redaelli <drizzt at gufi dotorg>)


Index: dbus-string.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-string.c,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- dbus-string.c	8 Aug 2006 20:59:26 -0000	1.71
+++ dbus-string.c	8 Aug 2006 22:08:39 -0000	1.72
@@ -1200,7 +1200,7 @@
   DBUS_VA_COPY (args_copy, args);
 
   /* Measure the message length without terminating nul */
-  len = _dbus_printf_length (format, args);
+  len = _dbus_printf_string_upper_bound (format, args);
 
   if (!_dbus_string_lengthen (str, len))
     {

Index: dbus-sysdeps.c
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.c,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -d -r1.104 -r1.105
--- dbus-sysdeps.c	8 Aug 2006 20:59:26 -0000	1.104
+++ dbus-sysdeps.c	8 Aug 2006 22:08:39 -0000	1.105
@@ -2988,8 +2988,8 @@
 /**
  * Measure the message length without terminating nul
  */
-int _dbus_printf_length (const char *format,
-                         va_list args)
+int _dbus_printf_string_upper_bound (const char *format,
+                                     va_list args)
 {
   char c;
   return vsnprintf (&c, 1, format, args);

Index: dbus-sysdeps.h
===================================================================
RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps.h,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- dbus-sysdeps.h	8 Aug 2006 20:59:26 -0000	1.51
+++ dbus-sysdeps.h	8 Aug 2006 22:08:39 -0000	1.52
@@ -37,6 +37,8 @@
 /* and it would just be annoying to abstract this */
 #include <errno.h>
 
+#include <stdarg.h>
+
 DBUS_BEGIN_DECLS
 
 /* The idea of this file is to encapsulate everywhere that we're
@@ -272,8 +274,8 @@
 
 void _dbus_exit (int code) _DBUS_GNUC_NORETURN;
 
-int _dbus_printf_length (const char *format,
-                         va_list args);
+int _dbus_printf_string_upper_bound (const char *format,
+                                     va_list args);
 
 
 /**