diff options
| author | Simon McVittie <smcv@collabora.com> | 2017-07-03 17:31:37 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2017-11-24 12:16:56 +0000 |
| commit | 608a453b73a9f5b165d20f08cfb0f17a3147f514 (patch) | |
| tree | 23e7f1aea11711f7121dde6e5da1066099c1e785 | |
| parent | 85e89a4e9bb6482b42feb34185a17b889d41fb88 (diff) | |
DBusString: Reverse the sense of ->invalid
It's easier to implement a stack-allocated string that is valid to
free (but for no other purpose) if we consider all-bits-zero to be
invalid.
Signed-off-by: Simon McVittie <smcv@collabora.com>
Reviewed-by: Philip Withnall <withnall@endlessm.com>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89104
| -rw-r--r-- | dbus/dbus-string-private.h | 4 | ||||
| -rw-r--r-- | dbus/dbus-string-util.c | 2 | ||||
| -rw-r--r-- | dbus/dbus-string.c | 6 | ||||
| -rw-r--r-- | dbus/dbus-string.h | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/dbus/dbus-string-private.h b/dbus/dbus-string-private.h index 2e6de900f..10f87bbc6 100644 --- a/dbus/dbus-string-private.h +++ b/dbus/dbus-string-private.h @@ -47,7 +47,7 @@ typedef struct int allocated; /**< Allocated size of data */ unsigned int constant : 1; /**< String data is not owned by DBusString */ unsigned int locked : 1; /**< DBusString has been locked and can't be changed */ - unsigned int invalid : 1; /**< DBusString is invalid (e.g. already freed) */ + unsigned int valid : 1; /**< DBusString is valid (initialized and not freed) */ unsigned int align_offset : 3; /**< str - align_offset is the actual malloc block */ } DBusRealString; @@ -77,7 +77,7 @@ _DBUS_STATIC_ASSERT (sizeof (DBusRealString) == sizeof (DBusString)); do { \ (void) real; /* might be unused unless asserting */ \ _dbus_assert ((real) != NULL); \ - _dbus_assert (!(real)->invalid); \ + _dbus_assert ((real)->valid); \ _dbus_assert ((real)->len >= 0); \ _dbus_assert ((real)->allocated >= 0); \ _dbus_assert ((real)->len <= ((real)->allocated - _DBUS_STRING_ALLOCATION_PADDING)); \ diff --git a/dbus/dbus-string-util.c b/dbus/dbus-string-util.c index 750275a0f..08e0e917a 100644 --- a/dbus/dbus-string-util.c +++ b/dbus/dbus-string-util.c @@ -242,7 +242,7 @@ _dbus_string_test (void) _dbus_assert (real_test_static_string->allocated > 5); _dbus_assert (real_test_static_string->constant); _dbus_assert (real_test_static_string->locked); - _dbus_assert (!real_test_static_string->invalid); + _dbus_assert (real_test_static_string->valid); _dbus_assert (real_test_static_string->align_offset == 0); /* Test shortening and setting length */ diff --git a/dbus/dbus-string.c b/dbus/dbus-string.c index 98d9f2b72..75134d6a8 100644 --- a/dbus/dbus-string.c +++ b/dbus/dbus-string.c @@ -156,7 +156,7 @@ _dbus_string_init_preallocated (DBusString *str, real->constant = FALSE; real->locked = FALSE; - real->invalid = FALSE; + real->valid = TRUE; real->align_offset = 0; fixup_alignment (real); @@ -225,7 +225,7 @@ _dbus_string_init_const_len (DBusString *str, real->allocated = real->len + _DBUS_STRING_ALLOCATION_PADDING; /* a lie, just to avoid special-case assertions... */ real->constant = TRUE; real->locked = TRUE; - real->invalid = FALSE; + real->valid = TRUE; real->align_offset = 0; /* We don't require const strings to be 8-byte aligned as the @@ -273,7 +273,7 @@ _dbus_string_free (DBusString *str) dbus_free (real->str - real->align_offset); - real->invalid = TRUE; + real->valid = FALSE; } static dbus_bool_t diff --git a/dbus/dbus-string.h b/dbus/dbus-string.h index 2f78a04c0..e7060b9fb 100644 --- a/dbus/dbus-string.h +++ b/dbus/dbus-string.h @@ -405,7 +405,7 @@ _dbus_string_get_const_udata_len (const DBusString *str, int start, int len) sizeof(_dbus_static_string_##name) - 1, \ sizeof(_dbus_static_string_##name) + \ _DBUS_STRING_ALLOCATION_PADDING, \ - TRUE, TRUE, FALSE, 0 } + TRUE, TRUE, TRUE, 0 } DBUS_END_DECLS |