* dbus/dbus-marshal-recursive-util.c, dbus/dbus-marshal-recursive.c:

  remove DBusMark

1 files changed, 0 insertions, 31 deletions

diff --git a/dbus/dbus-marshal-recursive.h b/dbus/dbus-marshal-recursive.h
index 686d162e..bc8a77f7 100644
--- a/dbus/dbus-marshal-recursive.h
+++ b/dbus/dbus-marshal-recursive.h
@@ -32,32 +32,11 @@
 #error "config.h not included here"
 #endif
 
-typedef struct DBusTypeMark        DBusTypeMark;
 typedef struct DBusTypeReader      DBusTypeReader;
 typedef struct DBusTypeWriter      DBusTypeWriter;
 typedef struct DBusTypeReaderClass DBusTypeReaderClass;
 typedef struct DBusArrayLenFixup   DBusArrayLenFixup;
 
-/** The mark is a way to compress a #DBusTypeReader; it isn't all that
- * successful though. The idea was to use this for caching header
- * fields in dbus-message.c. However now I'm thinking why not cache
- * the actual values (e.g. char*) and if the field needs to be set or
- * deleted, just linear search for it. Those operations are uncommon,
- * and getting the values should be fast and not involve all this type
- * reader nonsense.
- *
- * @todo 1.0 DBusTypeMark isn't used right now and probably won't be, we should delete it
- */
-struct DBusTypeMark
-{
-  dbus_uint32_t type_pos_in_value_str : 1; /**< true if the type_pos is in value_str and not type_str */
-  dbus_uint32_t container_type : 3; /**< the "id" of the container type */
-  dbus_uint32_t array_len_offset : 3; /**< bytes back from start_pos that len ends */
-  dbus_uint32_t type_pos : DBUS_MAXIMUM_MESSAGE_LENGTH_BITS; /**< position in type_str */
-  dbus_uint32_t value_pos : DBUS_MAXIMUM_MESSAGE_LENGTH_BITS; /**< position in value_str */
-  dbus_uint32_t array_start_pos : DBUS_MAXIMUM_MESSAGE_LENGTH_BITS; /**< start of the array the reader was iterating over */
-};
-
 /**
  * The type reader is an iterator for reading values from a block of
  * values.
@@ -128,19 +107,9 @@ void        _dbus_type_reader_init                      (DBusTypeReader        *
                                                          int                    type_pos,
                                                          const DBusString      *value_str,
                                                          int                    value_pos);
-void        _dbus_type_reader_init_from_mark            (DBusTypeReader        *reader,
-                                                         int                    byte_order,
-                                                         const DBusString      *type_str,
-                                                         const DBusString      *value_str,
-                                                         const DBusTypeMark    *mark);
 void        _dbus_type_reader_init_types_only           (DBusTypeReader        *reader,
                                                          const DBusString      *type_str,
                                                          int                    type_pos);
-void        _dbus_type_reader_init_types_only_from_mark (DBusTypeReader        *reader,
-                                                         const DBusString      *type_str,
-                                                         const DBusTypeMark    *mark);
-void        _dbus_type_reader_save_mark                 (const DBusTypeReader  *reader,
-                                                         DBusTypeMark          *mark);
 int         _dbus_type_reader_get_current_type          (const DBusTypeReader  *reader);
 int         _dbus_type_reader_get_element_type          (const DBusTypeReader  *reader);
 int         _dbus_type_reader_get_value_pos             (const DBusTypeReader  *reader);