dbus: fix 64-bit compiler warnings

[platform/upstream/dbus.git] / dbus / dbus-nonce.h

diff --git a/dbus/dbus-nonce.h b/dbus/dbus-nonce.h
index 85cfd7f..99366fd 100644 (file)
--- a/dbus/dbus-nonce.h
+++ b/dbus/dbus-nonce.h
@@ -27,28 +27,44 @@
 #include <dbus/dbus-types.h>
 #include <dbus/dbus-errors.h>
 #include <dbus/dbus-string.h>
+#include <dbus/dbus-sysdeps.h>
 
 DBUS_BEGIN_DECLS
 
-dbus_bool_t _dbus_check_nonce (int fd,
-                               const DBusString *nonce);
+typedef struct DBusNonceFile DBusNonceFile;
 
-dbus_bool_t _dbus_read_nonce (const DBusString *fname,
-                              DBusString *nonce);
+struct DBusNonceFile
+{
+  DBusString path;
+  DBusString dir;
+};
+
+// server
+
+dbus_bool_t _dbus_noncefile_create (DBusNonceFile *noncefile,
+                                    DBusError *error);
+
+dbus_bool_t _dbus_noncefile_delete (DBusNonceFile *noncefile,
+                                    DBusError *error);
 
-int _dbus_accept_with_nonce (int listen_fd,
-                             const DBusString *nonce);
+dbus_bool_t _dbus_noncefile_check_nonce (DBusSocket fd,
+                                         const DBusNonceFile *noncefile,
+                                         DBusError *error);
 
-int _dbus_accept_with_noncefile (int listen_fd,
-                                 const DBusString *noncefile);
+const DBusString* _dbus_noncefile_get_path (const DBusNonceFile *noncefile);
 
-dbus_bool_t _dbus_generate_noncefilename (DBusString *buf,
-                                          DBusError *error);
+DBusSocket _dbus_accept_with_noncefile(DBusSocket listen_fd,
+                                 const DBusNonceFile *noncefile);
+
+// shared
+
+dbus_bool_t _dbus_read_nonce (const DBusString *fname,
+                              DBusString *nonce,
+                              DBusError *error);
 
-dbus_bool_t _dbus_generate_and_write_nonce (const DBusString *filename,
-                                            DBusError *error);
+// client
 
-dbus_bool_t _dbus_send_nonce (int fd,
+dbus_bool_t _dbus_send_nonce (DBusSocket fd,
                               const DBusString *noncefile,
                               DBusError *error);