X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-errors.h;h=e63139a011450b99a33658f9fcf361bc4d2ee067;hb=0cb9ccf2af64af8c575fa73db9d0872b61aaacb9;hp=63edbdbf016175f987070a0d8910eaff2c8577a9;hpb=29560adcc79a259a0be3511c056ee7453aa26c04;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-errors.h b/dbus/dbus-errors.h index 63edbdb..e63139a 100644 --- a/dbus/dbus-errors.h +++ b/dbus/dbus-errors.h @@ -1,10 +1,10 @@ -/* -*- mode: C; c-file-style: "gnu" -*- */ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ /* dbus-errors.h Error reporting * * Copyright (C) 2002 Red Hat Inc. * Copyright (C) 2003 CodeFactory AB * - * Licensed under the Academic Free License version 1.2 + * Licensed under the Academic Free License version 2.1 * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -18,7 +18,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ #if !defined (DBUS_INSIDE_DBUS_H) && !defined (DBUS_COMPILATION) @@ -30,15 +30,25 @@ #include #include +#include -DBUS_BEGIN_DECLS; +DBUS_BEGIN_DECLS +/** + * @addtogroup DBusErrors + * @{ + */ + +/** Mostly-opaque type representing an error that occurred */ typedef struct DBusError DBusError; +/** + * Object representing an exception. + */ struct DBusError { - const char *name; /**< error name */ - const char *message; /**< error message */ + const char *name; /**< public error name field */ + const char *message; /**< public error message field */ unsigned int dummy1 : 1; /**< placeholder */ unsigned int dummy2 : 1; /**< placeholder */ @@ -49,72 +59,32 @@ struct DBusError void *padding1; /**< placeholder */ }; -#define DBUS_ERROR_FAILED "org.freedesktop.DBus.Error.Failed" -#define DBUS_ERROR_ACTIVATE_SERVICE_NOT_FOUND "org.freedesktop.DBus.Activate.ServiceNotFound" -#define DBUS_ERROR_SPAWN_FORK_FAILED "org.freedesktop.DBus.Error.Spawn.ForkFailed" -#define DBUS_ERROR_SPAWN_FAILED "org.freedesktop.DBus.Error.Spawn.Failed" -#define DBUS_ERROR_NO_MEMORY "org.freedesktop.DBus.Error.NoMemory" -#define DBUS_ERROR_SERVICE_DOES_NOT_EXIST "org.freedesktop.DBus.Error.ServiceDoesNotExist" -#define DBUS_ERROR_NO_REPLY "org.freedesktop.DBus.Error.NoReply" -#define DBUS_ERROR_IO_ERROR "org.freedesktop.DBus.Error.IOError" -#define DBUS_ERROR_BAD_ADDRESS "org.freedesktop.DBus.Error.BadAddress" -#define DBUS_ERROR_NOT_SUPPORTED "org.freedesktop.DBus.Error.NotSupported" -#define DBUS_ERROR_LIMITS_EXCEEDED "org.freedesktop.DBus.Error.LimitsExceeded" -#define DBUS_ERROR_ACCESS_DENIED "org.freedesktop.DBus.Error.AccessDenied" -#define DBUS_ERROR_AUTH_FAILED "org.freedesktop.DBus.Error.AuthFailed" -#define DBUS_ERROR_NO_SERVER "org.freedesktop.DBus.Error.NoServer" -#define DBUS_ERROR_TIMEOUT "org.freedesktop.DBus.Error.Timeout" -#define DBUS_ERROR_NO_NETWORK "org.freedesktop.DBus.Error.NoNetwork" -#define DBUS_ERROR_ADDRESS_IN_USE "org.freedesktop.DBus.Error.AddressInUse" -#define DBUS_ERROR_DISCONNECTED "org.freedesktop.DBus.Error.Disconnected" -#define DBUS_ERROR_INVALID_ARGS "org.freedesktop.DBus.Error.InvalidArgs" -#define DBUS_ERROR_FILE_NOT_FOUND "org.freedesktop.DBus.Error.FileNotFound" -#define DBUS_ERROR_UNKNOWN_MESSAGE "org.freedesktop.DBus.Error.UnknownMessage" - -typedef enum -{ - DBUS_RESULT_SUCCESS, /**< Operation was successful. */ - DBUS_RESULT_FAILED, /**< Operation failed for unspecified reason. */ - DBUS_RESULT_NO_MEMORY, /**< Operation failed for lack of memory. */ - DBUS_RESULT_IO_ERROR, /**< Operation failed because of an IO error, - * typically the other end closed the - * connection. - */ - DBUS_RESULT_BAD_ADDRESS, /**< Address was bad, could not be parsed. */ - DBUS_RESULT_NOT_SUPPORTED, /**< Feature is not supported. */ - DBUS_RESULT_LIMITS_EXCEEDED, /**< Some kernel resource limit exceeded. */ - DBUS_RESULT_ACCESS_DENIED, /**< Some sort of permissions/security problem. */ - DBUS_RESULT_AUTH_FAILED, /**< Could not authenticate. */ - DBUS_RESULT_NO_SERVER, /**< No one listening on the other end. */ - DBUS_RESULT_TIMEOUT, /**< Timed out trying to connect. */ - DBUS_RESULT_NO_NETWORK, /**< Can't find the network */ - DBUS_RESULT_ADDRESS_IN_USE, /**< Someone's already using the address */ - DBUS_RESULT_DISCONNECTED, /**< No more connection. */ - DBUS_RESULT_INVALID_ARGS, /**< One or more invalid arguments encountered. */ - DBUS_RESULT_NO_REPLY, /**< Did not get a reply message. */ - DBUS_RESULT_FILE_NOT_FOUND /**< File doesn't exist */ -} DBusResultCode; +#define DBUS_ERROR_INIT { NULL, NULL, TRUE, 0, 0, 0, 0, NULL } +DBUS_EXPORT void dbus_error_init (DBusError *error); +DBUS_EXPORT void dbus_error_free (DBusError *error); +DBUS_EXPORT void dbus_set_error (DBusError *error, const char *name, const char *message, ...); +DBUS_EXPORT void dbus_set_error_const (DBusError *error, const char *name, const char *message); +DBUS_EXPORT void dbus_move_error (DBusError *src, DBusError *dest); +DBUS_EXPORT dbus_bool_t dbus_error_has_name (const DBusError *error, const char *name); +DBUS_EXPORT dbus_bool_t dbus_error_is_set (const DBusError *error); +/** @} */ -void dbus_set_result (DBusResultCode *code_address, - DBusResultCode code); -const char* dbus_result_to_string (DBusResultCode code); - -DBUS_END_DECLS; +DBUS_END_DECLS #endif /* DBUS_ERROR_H */