[daemon-fix] fixed querying about name information

[platform/upstream/dbus.git] / dbus / dbus-marshal-header.h

diff --git a/dbus/dbus-marshal-header.h b/dbus/dbus-marshal-header.h
index 61e9246..350fe5c 100644 (file)
--- a/dbus/dbus-marshal-header.h
+++ b/dbus/dbus-marshal-header.h
@@ -1,4 +1,4 @@
-/* -*- mode: C; c-file-style: "gnu" -*- */
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /* dbus-marshal-header.h  Managing marshaling/demarshaling of message headers
  *
  * Copyright (C) 2005  Red Hat, Inc.
@@ -17,21 +17,16 @@
  *
  * 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
  *
  */
 
 #ifndef DBUS_MARSHAL_HEADER_H
 #define DBUS_MARSHAL_HEADER_H
 
-#include <config.h>
 #include <dbus/dbus-marshal-basic.h>
 #include <dbus/dbus-marshal-validate.h>
 
-#ifndef PACKAGE
-#error "config.h not included here"
-#endif
-
 typedef struct DBusHeader      DBusHeader;
 typedef struct DBusHeaderField DBusHeaderField;
 
@@ -64,12 +59,11 @@ struct DBusHeader
   dbus_uint32_t byte_order : 8;     /**< byte order of header */
 };
 
-dbus_bool_t   _dbus_header_init                   (DBusHeader        *header,
-                                                   int                byte_order);
+dbus_bool_t   _dbus_header_init                   (DBusHeader        *header);
 void          _dbus_header_free                   (DBusHeader        *header);
-void          _dbus_header_reinit                 (DBusHeader        *header,
-                                                   int                byte_order);
+void          _dbus_header_reinit                 (DBusHeader        *header);
 dbus_bool_t   _dbus_header_create                 (DBusHeader        *header,
+                                                   int                byte_order,
                                                    int                type,
                                                    const char        *destination,
                                                    const char        *path,
@@ -115,7 +109,8 @@ dbus_bool_t   _dbus_header_have_message_untrusted (int                max_messag
                                                    const DBusString  *str,
                                                    int                start,
                                                    int                len);
-dbus_bool_t   _dbus_header_load_untrusted         (DBusHeader        *header,
+dbus_bool_t   _dbus_header_load                   (DBusHeader        *header,
+                                                   DBusValidationMode mode,
                                                    DBusValidity      *validity,
                                                    int                byte_order,
                                                    int                fields_array_len,
@@ -124,7 +119,9 @@ dbus_bool_t   _dbus_header_load_untrusted         (DBusHeader        *header,
                                                    const DBusString  *str,
                                                    int                start,
                                                    int                len);
-
+void          _dbus_header_byteswap               (DBusHeader        *header,
+                                                   int                new_order);
+char          _dbus_header_get_byte_order         (const DBusHeader  *header);