Added NameList method handling, small improvemnets and cleanups

[platform/upstream/dbus.git] / dbus / dbus-sysdeps-util-win.c

diff --git a/dbus/dbus-sysdeps-util-win.c b/dbus/dbus-sysdeps-util-win.c
index b42ac27..abb10f7 100644 (file)
--- a/dbus/dbus-sysdeps-util-win.c
+++ b/dbus/dbus-sysdeps-util-win.c
@@ -34,6 +34,7 @@
 #include "dbus-sysdeps-win.h"
 #include "dbus-sockets-win.h"
 #include "dbus-memory.h"
+#include "dbus-pipe.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -190,7 +191,7 @@ _dbus_write_pid_to_file_and_pipe (const DBusString *pidfile,
       DBusString pid;
       int bytes;
 
-      _dbus_verbose ("writing our pid to pipe %d\n", print_pid_pipe->fd_or_handle);
+      _dbus_verbose ("writing our pid to pipe %d\n", print_pid_pipe->fd);
 
       if (!_dbus_string_init (&pid))
         {
@@ -256,9 +257,14 @@ _dbus_change_to_daemon_user  (const char    *user,
 }
 
 void
-_dbus_init_system_log (void)
+_dbus_request_file_descriptor_limit (unsigned int limit)
 {
-    // FIXME!
+}
+
+void
+_dbus_init_system_log (dbus_bool_t is_daemon)
+{
+  /* OutputDebugStringA doesn't need any special initialization, do nothing */
 }
 
 /**
@@ -305,7 +311,8 @@ _dbus_system_logv (DBusSystemLogSeverity severity, const char *msg, va_list args
    }
    
   sprintf(buf,"%s%s",s,msg);
-  _dbus_verbose_real ("",0,"",buf,args);
+  vsprintf(buf,buf,args);
+  OutputDebugStringA(buf);
   
   if (severity == DBUS_SYSTEM_LOG_FATAL)
     exit (1);
@@ -675,23 +682,6 @@ _dbus_directory_close (DBusDirIter *iter)
   dbus_free (iter);
 }
 
-/**
- * Checks whether the filename is an absolute path
- *
- * @param filename the filename
- * @returns #TRUE if an absolute path
- */
-dbus_bool_t
-_dbus_path_is_absolute (const DBusString *filename)
-{
-  if (_dbus_string_get_length (filename) > 0)
-    return _dbus_string_get_byte (filename, 1) == ':'
-           || _dbus_string_get_byte (filename, 0) == '\\'
-           || _dbus_string_get_byte (filename, 0) == '/';
-  else
-    return FALSE;
-}
-
 /** @} */ /* End of DBusInternalsUtils functions */
 
 /**