[daemon-fix] fixed querying about name information

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

diff --git a/dbus/dbus-errors.h b/dbus/dbus-errors.h
index 344c449..e63139a 100644 (file)
--- 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 2.0
+ * 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,9 +30,16 @@
 
 #include <dbus/dbus-macros.h>
 #include <dbus/dbus-types.h>
+#include <dbus/dbus-protocol.h>
 
-DBUS_BEGIN_DECLS;
+DBUS_BEGIN_DECLS
 
+/**
+ * @addtogroup DBusErrors
+ * @{
+ */
+
+/** Mostly-opaque type representing an error that occurred */
 typedef struct DBusError DBusError;
 
 /**
@@ -40,8 +47,8 @@ typedef struct DBusError DBusError;
  */
 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 */
@@ -52,21 +59,32 @@ struct DBusError
   void *padding1; /**< placeholder */
 };
 
+#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);
 
-DBUS_END_DECLS;
+/** @} */
+
+DBUS_END_DECLS
 
 #endif /* DBUS_ERROR_H */