752d5b47d2
2000-11-20 Martin Baulig <baulig@suse.de> Started with the big rewrite for GNOME 2.0: - split the `glibtop' structure into `glibtop_server' and `glibtop_client' and make `glibtop_client' a GObject. - cleanly separate the library and the backends. This stuff currently does not compile. * glibtop.h (glibtop_server_private, glibtop_server_info): Removed typedefs. (struct _glibtop, struct _glibtop_server_info): Removed. (glibtop_global_server, glibtop_server_features): Removed. (glibtop_server_ref, glibtop_server_unref): Removed. * glibtop.h (glibtop_init_s): First argument is now a `glibtop_server *'. * include/glibtop/*.h: Removed all #defines with the glibtop_global_server. (glibtop_get_*_l): First argument is now a `glibtop_client *'. (glibtop_get_*_s, glibtop_init_*_s): First argument is now a `glibtop_server *'. * lib/glibtop-client.c: New file. * sysdeps/common/xmalloc.c: Moved to lib/. * sysdeps/common/error.c: Moved to lib/. * lib/xmalloc.c: Moved here from sysdeps/common/. * lib/error.c: Moved here from sysdeps/common/. * include/glibtop/backend.h (glibtop_backend_open_func_t, glibtop_backend_close_func_t): First argument is now a `glibtop_server *'. (glibtop_backend_info): Added `glibtop_server *server'. (glibtop_open_backend_l): Returns `glibtop_backend *', first argument is `glibtop_client *' and added `GError **'. * include/glibtop/close.h (glibtop_close_s, glibtop_close_p): First argument is now a `glibtop_server *'. * include/glibtop/error.h (*): First argument is now a `glibtop_server *'. * include/glibtop/errors.h: Switched this to use GError.
75 lines
1.9 KiB
C
75 lines
1.9 KiB
C
/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 4 -*- */
|
|
|
|
/* $Id$ */
|
|
|
|
/* Copyright (C) 1998-99 Martin Baulig
|
|
This file is part of LibGTop 1.0.
|
|
|
|
Contributed by Martin Baulig <martin@home-of-linux.org>, April 1998.
|
|
|
|
LibGTop is free software; you can redistribute it and/or modify it
|
|
under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License,
|
|
or (at your option) any later version.
|
|
|
|
LibGTop is distributed in the hope that it will be useful, but WITHOUT
|
|
ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
|
|
FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
|
|
for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with LibGTop; see the file COPYING. If not, write to the
|
|
Free Software Foundation, Inc., 59 Temple Place - Suite 330,
|
|
Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
#include <glibtop/xmalloc.h>
|
|
|
|
/* Wrappers to malloc, calloc, realloc ... */
|
|
|
|
void *
|
|
glibtop_malloc_r (glibtop_server *server, size_t size)
|
|
{
|
|
void *buf = malloc (size);
|
|
|
|
if (!buf)
|
|
glibtop_error_io_r (server, "malloc %d bytes", size);
|
|
|
|
return buf;
|
|
}
|
|
|
|
void *
|
|
glibtop_calloc_r (glibtop_server *server, size_t nmemb, size_t size)
|
|
{
|
|
void *buf = calloc (nmemb, size);
|
|
|
|
if (!buf)
|
|
glibtop_error_io_r (server, "calloc %d blocks (%d bytes each)",
|
|
nmemb, size);
|
|
|
|
return buf;
|
|
}
|
|
|
|
void *
|
|
glibtop_realloc_r (glibtop_server *server, void *ptr, size_t size)
|
|
{
|
|
void *buf = realloc (ptr, size);
|
|
|
|
if (!buf)
|
|
glibtop_error_io_r (server, "realloc %d bytes", size);
|
|
|
|
return buf;
|
|
}
|
|
|
|
char *
|
|
glibtop_strdup_r (glibtop_server *server, const char *string)
|
|
{
|
|
return strcpy (glibtop_malloc_r (server, strlen (string) + 1), string);
|
|
}
|
|
|
|
void
|
|
glibtop_free_r (glibtop_server *server, const void *ptr)
|
|
{
|
|
if (ptr) free ((void *) ptr);
|
|
}
|