diff --git a/backends/common/ChangeLog b/backends/common/ChangeLog index b65f8e2a..9dacdd00 100644 --- a/backends/common/ChangeLog +++ b/backends/common/ChangeLog @@ -1,3 +1,12 @@ +2000-11-26 Martin Baulig + + * glibtop-backend-private.h: Removed. + + * backend-common.h: New files. + + * backend-common.c (_open_common): Don't overwrite + `backend->_priv'. + 2000-11-22 Martin Baulig * Makefile.am: Link libgtop_backend_common.la against diff --git a/backends/common/Makefile.am b/backends/common/Makefile.am index 6b2aa0fe..4c2acae2 100644 --- a/backends/common/Makefile.am +++ b/backends/common/Makefile.am @@ -16,7 +16,7 @@ backend_DATA = \ libgtop-common.backend noinst_HEADERS = \ - glibtop-backend-private.h + backend-common.h backendlib_LTLIBRARIES = \ libgtop_backend_common.la diff --git a/backends/common/backend-common.c b/backends/common/backend-common.c index 500eccf9..3cea9d28 100644 --- a/backends/common/backend-common.c +++ b/backends/common/backend-common.c @@ -23,12 +23,7 @@ Boston, MA 02111-1307, USA. */ -#include -#include -#include - -#include -#include +#include static int _open_common (glibtop_server *, glibtop_backend *, u_int64_t, const char **); @@ -54,9 +49,6 @@ static int _open_common (glibtop_server *server, glibtop_backend *backend, u_int64_t features, const char **backend_args) { - backend->_priv = glibtop_calloc_r - (server, 1, sizeof (glibtop_backend_private)); - return 0; } diff --git a/backends/common/glibtop-backend-private.h b/backends/common/backend-common.h similarity index 87% rename from backends/common/glibtop-backend-private.h rename to backends/common/backend-common.h index 37234393..c47b5cf1 100644 --- a/backends/common/glibtop-backend-private.h +++ b/backends/common/backend-common.h @@ -23,16 +23,15 @@ Boston, MA 02111-1307, USA. */ -#ifndef __GLIBTOP_BACKEND_PRIVATE_H__ -#define __GLIBTOP_BACKEND_PRIVATE_H__ +#ifndef __GLIBTOP_BACKEND_COMMON_H__ +#define __GLIBTOP_BACKEND_COMMON_H__ + +#include +#include #include +#include #include #include -struct _glibtop_backend_private -{ - u_int64_t flags; -}; - #endif diff --git a/backends/common/marshal.pl b/backends/common/marshal.pl index 7fb21067..545a6a09 100644 --- a/backends/common/marshal.pl +++ b/backends/common/marshal.pl @@ -24,17 +24,13 @@ print '/* marshal.c */'; print "/* This is a generated file. Please modify `marshal.pl' */"; print ''; -print '#include '; -print '#include '; -print '#include '; +print '#include '; print ''; print '#include '; print '#include '; print ''; print '#include '; print ''; -print '#include '; -print ''; $feature_count = 0;