diff options
| author | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 10:46:54 +0000 |
|---|---|---|
| committer | Alexander Larsson <alexl@src.gnome.org> | 2007-09-13 10:46:54 +0000 |
| commit | 60ab74043bf04b54499c5a41541215715c2abcf7 (patch) | |
| tree | 94cceb5d11615e4b5dedc8088d513171b7d09a56 /daemon/gvfsdaemonutils.c | |
| parent | 5d6b79460989695825516d0e7e4057035a4cc653 (diff) | |
| download | gvfs-60ab74043bf04b54499c5a41541215715c2abcf7.tar.gz | |
Implement get_info
Original git commit by Alexander Larsson <alex@greebo.(none)> at 1168620303 +0100
svn path=/trunk/; revision=234
Diffstat (limited to 'daemon/gvfsdaemonutils.c')
| -rw-r--r-- | daemon/gvfsdaemonutils.c | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/daemon/gvfsdaemonutils.c b/daemon/gvfsdaemonutils.c index 8358811b..7daef4cb 100644 --- a/daemon/gvfsdaemonutils.c +++ b/daemon/gvfsdaemonutils.c @@ -2,6 +2,7 @@ #include <unistd.h> #include <errno.h> +#include <stdlib.h> #include <sys/types.h> #include <sys/socket.h> #include <sys/un.h> @@ -19,6 +20,13 @@ typedef struct { int fd_count; } ConnectionExtra; +void +g_dbus_oom (void) +{ + g_error ("DBus failed with out of memory error"); + exit (1); +} + /* We use _ for escaping, so its not valid */ #define VALID_INITIAL_NAME_CHARACTER(c) \ ( ((c) >= 'A' && (c) <= 'Z') || \ @@ -157,7 +165,7 @@ dbus_connection_add_fd_send_fd (DBusConnection *connection, extra->extra_fd = extra_fd; if (!dbus_connection_set_data (connection, extra_fd_slot, extra, free_extra)) - g_error ("Out of memory"); + g_dbus_oom (); } static int @@ -266,7 +274,7 @@ g_error_to_daemon_reply (GError *error, guint32 seq_nr, gsize *len_out) } void -_g_dbus_message_iter_append_filename (DBusMessageIter *iter, const char *filename) +_g_dbus_message_iter_append_cstring (DBusMessageIter *iter, const char *filename) { DBusMessageIter array; @@ -277,13 +285,13 @@ _g_dbus_message_iter_append_filename (DBusMessageIter *iter, const char *filenam DBUS_TYPE_ARRAY, DBUS_TYPE_BYTE_AS_STRING, &array)) - g_error ("out of memory"); + g_dbus_oom (); if (!dbus_message_iter_append_fixed_array (&array, DBUS_TYPE_BYTE, &filename, strlen (filename))) - g_error ("out of memory"); + g_dbus_oom (); if (!dbus_message_iter_close_container (iter, &array)) - g_error ("out of memory"); + g_dbus_oom (); } |