X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dbus%2Fdbus-memory.h;h=4fd56bd633b4527666ea4bdc92b98fd280ac774d;hb=1200c464b6c9051340960e07f0d61a51dad71286;hp=2c9e19ee16b7e7bcbe7e25a90d38309ba165bab5;hpb=e19ebac55d671ecd92877af182300311afa7641a;p=platform%2Fupstream%2Fdbus.git diff --git a/dbus/dbus-memory.h b/dbus/dbus-memory.h index 2c9e19e..4fd56bd 100644 --- a/dbus/dbus-memory.h +++ b/dbus/dbus-memory.h @@ -1,4 +1,4 @@ -/* -*- mode: C; c-file-style: "gnu" -*- */ +/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */ /* dbus-memory.h D-Bus memory handling * * Copyright (C) 2002 Red Hat Inc. @@ -17,7 +17,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) @@ -37,19 +37,33 @@ DBUS_BEGIN_DECLS * @{ */ +DBUS_EXPORT +DBUS_MALLOC +DBUS_ALLOC_SIZE(1) void* dbus_malloc (size_t bytes); + +DBUS_EXPORT +DBUS_MALLOC +DBUS_ALLOC_SIZE(1) void* dbus_malloc0 (size_t bytes); + +DBUS_EXPORT +DBUS_MALLOC +DBUS_ALLOC_SIZE(2) void* dbus_realloc (void *memory, size_t bytes); +DBUS_EXPORT void dbus_free (void *memory); -#define dbus_new(type, count) ((type*)dbus_malloc (sizeof (type) * (count))); -#define dbus_new0(type, count) ((type*)dbus_malloc0 (sizeof (type) * (count))); +#define dbus_new(type, count) ((type*)dbus_malloc (sizeof (type) * (count))) +#define dbus_new0(type, count) ((type*)dbus_malloc0 (sizeof (type) * (count))) +DBUS_EXPORT void dbus_free_string_array (char **str_array); typedef void (* DBusFreeFunction) (void *memory); +DBUS_EXPORT void dbus_shutdown (void); /** @} */