diff options
| author | Anders Carlsson <andersca@codefactory.se> | 2003-02-15 18:37:59 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@codefactory.se> | 2003-02-15 18:37:59 +0000 |
| commit | 30265b80acc505602e38d19c7d3036c19ee39340 (patch) | |
| tree | 08f877d81d63a2cefc5a184dac2855a44e2f9d14 | |
| parent | efd53eca67b7d0937533c3b8790368a368fb7dcb (diff) | |
2003-02-15 Anders Carlsson <andersca@codefactory.se>
* dbus/dbus-list.c: (_dbus_list_append_link),
(_dbus_list_prepend_link):
* dbus/dbus-memory.c: (dbus_malloc), (dbus_malloc0),
(dbus_realloc):
Warning fixes.
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | dbus/dbus-list.c | 4 | ||||
| -rw-r--r-- | dbus/dbus-memory.c | 8 |
3 files changed, 12 insertions, 8 deletions
@@ -1,5 +1,13 @@ 2003-02-15 Anders Carlsson <andersca@codefactory.se> + * dbus/dbus-list.c: (_dbus_list_append_link), + (_dbus_list_prepend_link): + * dbus/dbus-memory.c: (dbus_malloc), (dbus_malloc0), + (dbus_realloc): + Warning fixes. + +2003-02-15 Anders Carlsson <andersca@codefactory.se> + * bus/Makefile.am: * bus/activation.c: (bus_activation_entry_free), (add_desktop_file_entry), (load_directory), (bus_activation_init): diff --git a/dbus/dbus-list.c b/dbus/dbus-list.c index 8c4e0c3a..72357d53 100644 --- a/dbus/dbus-list.c +++ b/dbus/dbus-list.c @@ -287,8 +287,6 @@ _dbus_list_append_link (DBusList **list, /* Now cycle the list forward one so the prepended node is the tail */ *list = (*list)->next; - - return TRUE; } /** @@ -304,8 +302,6 @@ _dbus_list_prepend_link (DBusList **list, DBusList *link) { link_before (list, *list, link); - - return TRUE; } /** diff --git a/dbus/dbus-memory.c b/dbus/dbus-memory.c index 74c97c26..11489c78 100644 --- a/dbus/dbus-memory.c +++ b/dbus/dbus-memory.c @@ -75,7 +75,7 @@ #ifdef DBUS_BUILD_TESTS static dbus_bool_t inited = FALSE; static int fail_counts = -1; -static int fail_size = -1; +static size_t fail_size = 0; #endif #ifdef DBUS_BUILD_TESTS @@ -125,7 +125,7 @@ dbus_malloc (size_t bytes) if (bytes == 0) /* some system mallocs handle this, some don't */ return NULL; #if DBUS_BUILD_TESTS - else if (fail_size != -1 && bytes > fail_size) + else if (fail_size != 0 && bytes > fail_size) return NULL; #endif else @@ -159,7 +159,7 @@ dbus_malloc0 (size_t bytes) if (bytes == 0) return NULL; #if DBUS_BUILD_TESTS - else if (fail_size != -1 && bytes > fail_size) + else if (fail_size != 0 && bytes > fail_size) return NULL; #endif else @@ -198,7 +198,7 @@ dbus_realloc (void *memory, return NULL; } #if DBUS_BUILD_TESTS - else if (fail_size != -1 && bytes > fail_size) + else if (fail_size != 0 && bytes > fail_size) return NULL; #endif else |