oxmc/libgtop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- fixed compilation

Browse Source
This commit is contained in:
Bastien Nocera
2003-10-20 15:20:16 +00:00
parent ba36a20cb8
commit b67e4c7f7d
166 changed files with 434 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
ChangeLog
View File

@@ -1,3 +1,80 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop.h:
* include/glibtop/close.h:
* include/glibtop/command.h:
* include/glibtop/cpu.h:
* include/glibtop/error.h:
* include/glibtop/fsusage.h:
* include/glibtop/global.h:
* include/glibtop/inodedb.h:
* include/glibtop/loadavg.h:
* include/glibtop/mem.h:
* include/glibtop/mountlist.h:
* include/glibtop/msg_limits.h:
* include/glibtop/netload.h:
* include/glibtop/open.h:
* include/glibtop/parameter.h:
* include/glibtop/ppp.h:
* include/glibtop/procargs.h:
* include/glibtop/prockernel.h:
* include/glibtop/proclist.h:
* include/glibtop/procmap.h:
* include/glibtop/procmem.h:
* include/glibtop/procsegment.h:
* include/glibtop/procsignal.h:
* include/glibtop/procstate.h:
* include/glibtop/proctime.h:
* include/glibtop/procuid.h:
* include/glibtop/read.h:
* include/glibtop/read_data.h:
* include/glibtop/sem_limits.h:
* include/glibtop/shm_limits.h:
* include/glibtop/signal.h:
* include/glibtop/swap.h:
* include/glibtop/sysdeps.h:
* include/glibtop/sysinfo.h:
* include/glibtop/types.h:
* include/glibtop/union.h:
* include/glibtop/uptime.h:
* include/glibtop/version.h:
* include/glibtop/write.h:
* lib/Makefile.am:
* lib/command.c: (glibtop_call_l):
* lib/init.c:
* lib/inodedb.c:
* lib/lib.pl:
* lib/open.c:
* lib/read.c:
* lib/read_data.c: (glibtop_read_data_l):
* lib/structures.pl:
* lib/write.c:
* sysdeps/names/cpu.c:
* sysdeps/names/fsusage.c:
* sysdeps/names/loadavg.c:
* sysdeps/names/mem.c:
* sysdeps/names/mountlist.c:
* sysdeps/names/msg_limits.c:
* sysdeps/names/netinfo.c:
* sysdeps/names/netload.c:
* sysdeps/names/ppp.c:
* sysdeps/names/procargs.c:
* sysdeps/names/proccwd.c:
* sysdeps/names/prockernel.c:
* sysdeps/names/proclist.c:
* sysdeps/names/procmap.c:
* sysdeps/names/procmem.c:
* sysdeps/names/procsegment.c:
* sysdeps/names/procsignal.c:
* sysdeps/names/procstate.c:
* sysdeps/names/proctime.c:
* sysdeps/names/procuid.c:
* sysdeps/names/sem_limits.c:
* sysdeps/names/shm_limits.c:
* sysdeps/names/swap.c:
* sysdeps/names/sysdeps.c:
* sysdeps/names/uptime.c: fixed compilation
2003-10-20 Bastien Nocera <hadess@hadess.net> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* RELNOTES-0.25: removed * RELNOTES-0.25: removed

4
backends/common/ChangeLog
View File

@@ -1,3 +1,7 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* backend-common.h: fixed compilation
2000-11-26 Martin Baulig <martin@home-of-linux.org> 2000-11-26 Martin Baulig <martin@home-of-linux.org>
* glibtop-backend-private.h: Removed. * glibtop-backend-private.h: Removed.

1
backends/common/backend-common.h
View File

@@ -30,7 +30,6 @@
#include <glibtop/global.h> #include <glibtop/global.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/xmalloc.h>
#include <glibtop/glibtop-backend.h> #include <glibtop/glibtop-backend.h>
#include <glibtop/glibtop-backend-info.h> #include <glibtop/glibtop-backend-info.h>

7
backends/server/ChangeLog
View File

@@ -1,3 +1,10 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* backend-server.h:
* command.h.in:
* demarshal.pl:
* server.h: fixed compilation
2003-10-20 Bastien Nocera <hadess@hadess.net> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* backend-server.c: (_open_server): * backend-server.c: (_open_server):

1
backends/server/backend-server.h
View File

@@ -30,7 +30,6 @@
#include <glibtop/global.h> #include <glibtop/global.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/xmalloc.h>
#include <glibtop/glibtop-backend.h> #include <glibtop/glibtop-backend.h>
#include <glibtop/glibtop-backend-info.h> #include <glibtop/glibtop-backend-info.h>

4
backends/server/command.h.in
View File

@@ -31,7 +31,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/union.h> #include <glibtop/union.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
@@GLIBTOP_COMMAND_CONSTANTS@@ @@GLIBTOP_COMMAND_CONSTANTS@@
@@ -54,6 +54,6 @@ struct _glibtop_response
u_int64_t recv_size, data_size; u_int64_t recv_size, data_size;
}; };
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

1
backends/server/demarshal.pl
View File

@@ -26,7 +26,6 @@ print '';
print '#include <glibtop.h>'; print '#include <glibtop.h>';
print '#include <glibtop/open.h>'; print '#include <glibtop/open.h>';
print '#include <glibtop/xmalloc.h>';
print ''; print '';
print '#include <glibtop/sysdeps.h>'; print '#include <glibtop/sysdeps.h>';
print '#include <glibtop/union.h>'; print '#include <glibtop/union.h>';

5
backends/server/server.h
View File

@@ -31,7 +31,6 @@
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/union.h> #include <glibtop/union.h>
#include <glibtop/xmalloc.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>
#include <fcntl.h> #include <fcntl.h>
@@ -44,7 +43,7 @@
#include "command.h" #include "command.h"
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
/* Some don't have LOG_PERROR */ /* Some don't have LOG_PERROR */
#ifndef LOG_PERROR #ifndef LOG_PERROR
@@ -80,6 +79,6 @@ glibtop_send_version_i (glibtop *server, int fd);
extern int enable_debug; extern int enable_debug;
extern int verbose_output; extern int verbose_output;
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
backends/sysdeps/ChangeLog
View File

@@ -1,3 +1,7 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* backend-sysdeps.h: fixed compilation
2000-11-26 Martin Baulig <martin@home-of-linux.org> 2000-11-26 Martin Baulig <martin@home-of-linux.org>
* glibtop-backend-private.h: Removed. * glibtop-backend-private.h: Removed.

1
backends/sysdeps/backend-sysdeps.h
View File

@@ -30,7 +30,6 @@
#include <glibtop/global.h> #include <glibtop/global.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/xmalloc.h>
#include <glibtop/glibtop-backend.h> #include <glibtop/glibtop-backend.h>
#include <glibtop/glibtop-backend-info.h> #include <glibtop/glibtop-backend-info.h>

12
examples/ChangeLog
View File

@@ -1,3 +1,15 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* first.c:
* mountlist.c:
* netload.c:
* procmap.c:
* second.c:
* smp.c:
* sysdeps.c:
* third.c:
* timings.c: fixed compilation
2003-10-20 Bastien Nocera <hadess@hadess.net> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* Makefile.am: removed traces of guile, intllibs and libgnomesupport * Makefile.am: removed traces of guile, intllibs and libgnomesupport

1
examples/first.c
View File

@@ -26,7 +26,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/xmalloc.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>

1
examples/mountlist.c
View File

@@ -26,7 +26,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/xmalloc.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>

1
examples/netload.c
View File

@@ -26,7 +26,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/xmalloc.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>

1
examples/procmap.c
View File

@@ -26,7 +26,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/xmalloc.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>

1
examples/second.c
View File

@@ -27,7 +27,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/xmalloc.h>
#include <glibtop/union.h> #include <glibtop/union.h>
#include <glibtop/sysdeps.h> #include <glibtop/sysdeps.h>

1
examples/smp.c
View File

@@ -26,7 +26,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/cpu.h> #include <glibtop/cpu.h>
#include <glibtop/xmalloc.h>
int int
main (int argc, char *argv []) main (int argc, char *argv [])

1
examples/sysdeps.c
View File

@@ -26,7 +26,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/xmalloc.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>

1
examples/third.c
View File

@@ -27,7 +27,6 @@
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/xmalloc.h>
#include <glibtop/union.h> #include <glibtop/union.h>
#include <glibtop/sysdeps.h> #include <glibtop/sysdeps.h>

1
examples/timings.c
View File

@@ -26,7 +26,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/xmalloc.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>

20
glibtop.h
View File

@@ -84,24 +84,4 @@ glibtop_init_s (glibtop **server_ptr,
unsigned long features, unsigned long features,
unsigned flags); unsigned flags);
#ifdef GLIBTOP_GUILE
/* You need to link with -lgtop_guile to get this stuff here. */
void glibtop_boot_guile (void);
#endif
#ifdef GLIBTOP_GUILE_NAMES
/* You need to link with -lgtop_guile_names to get this stuff here. */
void glibtop_boot_guile_names (void);
#ifndef GLIBTOP_NAMES
#define GLIBTOP_NAMES
#endif
#endif
#endif #endif

4
include/glibtop/close.h
View File

@@ -26,13 +26,13 @@
#include <glibtop.h> #include <glibtop.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
void glibtop_close_r (glibtop *server); void glibtop_close_r (glibtop *server);
void glibtop_close_s (glibtop *server); void glibtop_close_s (glibtop *server);
void glibtop_close_p (glibtop *server); void glibtop_close_p (glibtop *server);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/command.h
View File

@@ -28,7 +28,7 @@
#include <glibtop/sysdeps.h> #include <glibtop/sysdeps.h>
#include <glibtop/union.h> #include <glibtop/union.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_CMND_QUIT 0 #define GLIBTOP_CMND_QUIT 0
#define GLIBTOP_CMND_SYSDEPS 1 #define GLIBTOP_CMND_SYSDEPS 1
@@ -97,6 +97,6 @@ void *
glibtop_call_s (glibtop *server, unsigned command, size_t send_size, glibtop_call_s (glibtop *server, unsigned command, size_t send_size,
const void *send_buf, size_t recv_size, void *recv_buf); const void *send_buf, size_t recv_size, void *recv_buf);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/cpu.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_CPU_TOTAL 0 #define GLIBTOP_CPU_TOTAL 0
#define GLIBTOP_CPU_USER 1 #define GLIBTOP_CPU_USER 1
@@ -94,6 +94,6 @@ extern const char *glibtop_descriptions_cpu [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/error.h
View File

@@ -26,7 +26,7 @@
#include <glibtop.h> #include <glibtop.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#ifndef G_GNUC_UNUSED #ifndef G_GNUC_UNUSED
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4) #if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
@@ -131,6 +131,6 @@ glibtop_warn_io (char *format, ...)
#endif /* no __GNUC__ */ #endif /* no __GNUC__ */
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/fsusage.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_FSUSAGE_BLOCKS 0 #define GLIBTOP_FSUSAGE_BLOCKS 0
#define GLIBTOP_FSUSAGE_BFREE 1 #define GLIBTOP_FSUSAGE_BFREE 1
@@ -67,6 +67,6 @@ extern const char *glibtop_descriptions_fsusage [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

63
include/glibtop/global.h
View File

@@ -24,43 +24,14 @@
#ifndef __GLIBTOP_GLOBAL_H__ #ifndef __GLIBTOP_GLOBAL_H__
#define __GLIBTOP_GLOBAL_H__ #define __GLIBTOP_GLOBAL_H__
#include <glib.h>
#ifdef _IN_LIBGTOP #ifdef _IN_LIBGTOP
#include <config.h> #include <config.h>
#endif #endif
/*
* All declarations are enclosed in BEGIN_LIBGTOP_DECLS and
* END_LIBGTOP_DECLS so that C++ compilers don't mangle their names.
*
*/
#undef BEGIN_LIBGTOP_DECLS
#undef END_LIBGTOP_DECLS
#ifdef __cplusplus
# define BEGIN_LIBGTOP_DECLS extern "C" {
# define END_LIBGTOP_DECLS }
#else
# define BEGIN_LIBGTOP_DECLS /* empty */
# define END_LIBGTOP_DECLS /* empty */
#endif
#ifdef _IN_LIBGTOP #ifdef _IN_LIBGTOP
/* Provide macros to feature the GCC function attribute.
*/
#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ > 4)
#define G_GNUC_NORETURN \
__attribute__((noreturn))
#define G_GNUC_CONST \
__attribute__((const))
#define G_GNUC_UNUSED \
__attribute__((unused))
#else /* !__GNUC__ */
#define G_GNUC_NORETURN
#define G_GNUC_CONST
#define G_GNUC_UNUSED
#endif /* !__GNUC__ */
#endif /* _IN_LIBGTOP */ #endif /* _IN_LIBGTOP */
#if TIME_WITH_SYS_TIME #if TIME_WITH_SYS_TIME
@@ -74,27 +45,6 @@
# endif # endif
#endif #endif
#ifdef NEED_GNOMESUPPORT_H
#include <gnomesupport.h>
#endif
#ifdef WITHOUT_GUILE
#undef GLIBTOP_GUILE
#undef GLIBTOP_GUILE_NAMES
#endif
#ifdef GLIBTOP_GUILE
#include <guile/gh.h>
#endif
#ifdef _IN_LIBGTOP
#if (defined HAVE_LIBINTL_H) || (defined HAVE_GETTEXT)
#include <libintl.h>
#else
#include <libgettext.h>
#endif
#endif
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
@@ -124,18 +74,13 @@
#ifdef _IN_LIBGTOP #ifdef _IN_LIBGTOP
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#ifndef _
#define _(String) dgettext (PACKAGE, String)
#define N_(String) (String)
#endif
#ifndef HAVE_STRERROR #ifndef HAVE_STRERROR
char *strerror (int errno); char *strerror (int errno);
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif /* _IN_LIBGTOP */ #endif /* _IN_LIBGTOP */

4
include/glibtop/inodedb.h
View File

@@ -31,7 +31,7 @@
#define GLIBTOP_INODEDB_ALL 7 #define GLIBTOP_INODEDB_ALL 7
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
typedef struct _glibtop_inodedb glibtop_inodedb; typedef struct _glibtop_inodedb glibtop_inodedb;
@@ -62,6 +62,6 @@ glibtop_inodedb_lookup_s (glibtop *server,
void void
glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb); glibtop_inodedb_close_s (glibtop *server, glibtop_inodedb *inodedb);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/loadavg.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_LOADAVG_LOADAVG 0 #define GLIBTOP_LOADAVG_LOADAVG 0
#define GLIBTOP_LOADAVG_NR_RUNNING 1 #define GLIBTOP_LOADAVG_NR_RUNNING 1
@@ -76,6 +76,6 @@ extern const char *glibtop_descriptions_loadavg [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/mem.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_MEM_TOTAL 0 #define GLIBTOP_MEM_TOTAL 0
#define GLIBTOP_MEM_USED 1 #define GLIBTOP_MEM_USED 1
@@ -84,6 +84,6 @@ extern const char *glibtop_descriptions_mem [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/mountlist.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_MOUNTLIST_NUMBER 0 #define GLIBTOP_MOUNTLIST_NUMBER 0
#define GLIBTOP_MOUNTLIST_TOTAL 1 #define GLIBTOP_MOUNTLIST_TOTAL 1
@@ -76,6 +76,6 @@ extern const char *glibtop_descriptions_mountlist [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/msg_limits.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_IPC_MSGPOOL 0 #define GLIBTOP_IPC_MSGPOOL 0
#define GLIBTOP_IPC_MSGMAP 1 #define GLIBTOP_IPC_MSGMAP 1
@@ -82,7 +82,7 @@ extern const char *glibtop_descriptions_msg_limits [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/netload.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_NETLOAD_IF_FLAGS 0 #define GLIBTOP_NETLOAD_IF_FLAGS 0
#define GLIBTOP_NETLOAD_MTU 1 #define GLIBTOP_NETLOAD_MTU 1
@@ -115,6 +115,6 @@ extern const char *glibtop_descriptions_netload [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/open.h
View File

@@ -26,7 +26,7 @@
#include <glibtop/read.h> #include <glibtop/read.h>
#include <glibtop/error.h> #include <glibtop/error.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define _GLIBTOP_INIT_STATE_INIT 0x10000 #define _GLIBTOP_INIT_STATE_INIT 0x10000
#define _GLIBTOP_INIT_STATE_OPEN 0x20000 #define _GLIBTOP_INIT_STATE_OPEN 0x20000
@@ -68,6 +68,6 @@ glibtop_open_s (glibtop *server, const char *program_name,
const unsigned long features, const unsigned flags); const unsigned long features, const unsigned flags);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/parameter.h
View File

@@ -25,7 +25,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PARAM_METHOD 1 #define GLIBTOP_PARAM_METHOD 1
#define GLIBTOP_PARAM_FEATURES 2 #define GLIBTOP_PARAM_FEATURES 2
@@ -46,6 +46,6 @@ void
glibtop_set_parameter_l (glibtop *server, const unsigned parameter, glibtop_set_parameter_l (glibtop *server, const unsigned parameter,
const void *data_ptr, size_t data_size); const void *data_ptr, size_t data_size);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/ppp.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PPP_STATE 0 #define GLIBTOP_PPP_STATE 0
#define GLIBTOP_PPP_BYTES_IN 1 #define GLIBTOP_PPP_BYTES_IN 1
@@ -80,6 +80,6 @@ extern const char *glibtop_descriptions_ppp [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/procargs.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROC_ARGS_SIZE 0 #define GLIBTOP_PROC_ARGS_SIZE 0
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_proc_args [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/prockernel.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROC_KERNEL_K_FLAGS 0 #define GLIBTOP_PROC_KERNEL_K_FLAGS 0
#define GLIBTOP_PROC_KERNEL_MIN_FLT 1 #define GLIBTOP_PROC_KERNEL_MIN_FLT 1
@@ -93,6 +93,6 @@ extern const char *glibtop_descriptions_proc_kernel [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/proclist.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROCLIST_NUMBER 0 #define GLIBTOP_PROCLIST_NUMBER 0
#define GLIBTOP_PROCLIST_TOTAL 1 #define GLIBTOP_PROCLIST_TOTAL 1
@@ -99,6 +99,6 @@ extern const char *glibtop_descriptions_proclist [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/procmap.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROC_MAP_NUMBER 0 #define GLIBTOP_PROC_MAP_NUMBER 0
#define GLIBTOP_PROC_MAP_TOTAL 1 #define GLIBTOP_PROC_MAP_TOTAL 1
@@ -105,6 +105,6 @@ extern const char *glibtop_descriptions_proc_map [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/procmem.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROC_MEM_SIZE 0 #define GLIBTOP_PROC_MEM_SIZE 0
#define GLIBTOP_PROC_MEM_VSIZE 1 #define GLIBTOP_PROC_MEM_VSIZE 1
@@ -84,6 +84,6 @@ extern const char *glibtop_descriptions_proc_mem [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/procsegment.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROC_SEGMENT_TEXT_RSS 0 #define GLIBTOP_PROC_SEGMENT_TEXT_RSS 0
#define GLIBTOP_PROC_SEGMENT_SHLIB_RSS 1 #define GLIBTOP_PROC_SEGMENT_SHLIB_RSS 1
@@ -87,6 +87,6 @@ extern const char *glibtop_descriptions_proc_segment [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/procsignal.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROC_SIGNAL_SIGNAL 0 #define GLIBTOP_PROC_SIGNAL_SIGNAL 0
#define GLIBTOP_PROC_SIGNAL_BLOCKED 1 #define GLIBTOP_PROC_SIGNAL_BLOCKED 1
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_proc_signal [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/procstate.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROC_STATE_CMD 0 #define GLIBTOP_PROC_STATE_CMD 0
#define GLIBTOP_PROC_STATE_STATE 1 #define GLIBTOP_PROC_STATE_STATE 1
@@ -85,6 +85,6 @@ extern const char *glibtop_descriptions_proc_state [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/proctime.h
View File

@@ -28,7 +28,7 @@
#include <glibtop/cpu.h> #include <glibtop/cpu.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROC_TIME_START_TIME 0 #define GLIBTOP_PROC_TIME_START_TIME 0
#define GLIBTOP_PROC_TIME_RTIME 1 #define GLIBTOP_PROC_TIME_RTIME 1
@@ -99,6 +99,6 @@ extern const char *glibtop_descriptions_proc_time [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/procuid.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_PROC_UID_UID 0 #define GLIBTOP_PROC_UID_UID 0
#define GLIBTOP_PROC_UID_EUID 1 #define GLIBTOP_PROC_UID_EUID 1
@@ -94,6 +94,6 @@ extern const char *glibtop_descriptions_proc_uid [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/read.h
View File

@@ -27,13 +27,13 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define glibtop_read(p1, p2) glibtop_read(glibtop_global_server, p1, p2) #define glibtop_read(p1, p2) glibtop_read(glibtop_global_server, p1, p2)
void glibtop_read_l (glibtop *server, size_t size, void *buf); void glibtop_read_l (glibtop *server, size_t size, void *buf);
void glibtop_read_s (glibtop *server, size_t size, void *buf); void glibtop_read_s (glibtop *server, size_t size, void *buf);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/read_data.h
View File

@@ -27,13 +27,13 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define glibtop_read_data() glibtop_read_data_r(glibtop_global_server) #define glibtop_read_data() glibtop_read_data_r(glibtop_global_server)
void *glibtop_read_data_l (glibtop *server); void *glibtop_read_data_l (glibtop *server);
void *glibtop_read_data_s (glibtop *server); void *glibtop_read_data_s (glibtop *server);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/sem_limits.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_IPC_SEMMAP 0 #define GLIBTOP_IPC_SEMMAP 0
#define GLIBTOP_IPC_SEMMNI 1 #define GLIBTOP_IPC_SEMMNI 1
@@ -88,6 +88,6 @@ extern const char *glibtop_descriptions_sem_limits [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/shm_limits.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_IPC_SHMMAX 0 #define GLIBTOP_IPC_SHMMAX 0
#define GLIBTOP_IPC_SHMMIN 1 #define GLIBTOP_IPC_SHMMIN 1
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_shm_limits [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/signal.h
View File

@@ -30,7 +30,7 @@
#include <sys/signal.h> #include <sys/signal.h>
#endif #endif
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
typedef struct _glibtop_signame glibtop_signame; typedef struct _glibtop_signame glibtop_signame;
@@ -42,6 +42,6 @@ struct _glibtop_signame
extern const glibtop_signame glibtop_sys_siglist []; extern const glibtop_signame glibtop_sys_siglist [];
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/swap.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_SWAP_TOTAL 0 #define GLIBTOP_SWAP_TOTAL 0
#define GLIBTOP_SWAP_USED 1 #define GLIBTOP_SWAP_USED 1
@@ -78,6 +78,6 @@ extern const char *glibtop_descriptions_swap [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/sysdeps.h
View File

@@ -26,7 +26,7 @@
#include <glibtop.h> #include <glibtop.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_SYSDEPS_FEATURES 0 #define GLIBTOP_SYSDEPS_FEATURES 0
#define GLIBTOP_SYSDEPS_CPU 1 #define GLIBTOP_SYSDEPS_CPU 1
@@ -105,6 +105,6 @@ extern const char *glibtop_descriptions_sysdeps [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/sysinfo.h
View File

@@ -30,7 +30,7 @@
#include <glib.h> #include <glib.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_SYSINFO_CPUINFO 0 #define GLIBTOP_SYSINFO_CPUINFO 0
@@ -59,6 +59,6 @@ struct _glibtop_sysinfo
glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server); glibtop_sysinfo *glibtop_get_sysinfo_s (glibtop *server);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/types.h
View File

@@ -24,7 +24,7 @@
#ifndef __GLIBTOP_TYPES_H__ #ifndef __GLIBTOP_TYPES_H__
#define __GLIBTOP_TYPES_H__ #define __GLIBTOP_TYPES_H__
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_TYPE_LONG 1 #define GLIBTOP_TYPE_LONG 1
#define GLIBTOP_TYPE_ULONG 2 #define GLIBTOP_TYPE_ULONG 2
@@ -33,6 +33,6 @@ BEGIN_LIBGTOP_DECLS
#define GLIBTOP_TYPE_CHAR 5 #define GLIBTOP_TYPE_CHAR 5
#define GLIBTOP_TYPE_STRING 6 #define GLIBTOP_TYPE_STRING 6
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/union.h
View File

@@ -50,7 +50,7 @@
#include <glibtop/netload.h> #include <glibtop/netload.h>
#include <glibtop/ppp.h> #include <glibtop/ppp.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
typedef union _glibtop_union glibtop_union; typedef union _glibtop_union glibtop_union;
@@ -80,6 +80,6 @@ union _glibtop_union
glibtop_ppp ppp; glibtop_ppp ppp;
}; };
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/uptime.h
View File

@@ -27,7 +27,7 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/global.h> #include <glibtop/global.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_UPTIME_UPTIME 0 #define GLIBTOP_UPTIME_UPTIME 0
#define GLIBTOP_UPTIME_IDLETIME 1 #define GLIBTOP_UPTIME_IDLETIME 1
@@ -72,6 +72,6 @@ extern const char *glibtop_descriptions_uptime [];
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/version.h
View File

@@ -29,7 +29,7 @@
#define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)." #define LIBGTOP_VERSION_STRING "Libgtop %s server version %s (%u,%u,%u,%u)."
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#if _IN_LIBGTOP #if _IN_LIBGTOP
@@ -37,6 +37,6 @@ void glibtop_send_version (glibtop *server, int fd);
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
include/glibtop/write.h
View File

@@ -27,13 +27,13 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define glibtop_write(p1, p2) glibtop_write(glibtop_global_server, p1, p2) #define glibtop_write(p1, p2) glibtop_write(glibtop_global_server, p1, p2)
void glibtop_write_l (glibtop *server, size_t size, void *buf); void glibtop_write_l (glibtop *server, size_t size, void *buf);
void glibtop_write_s (glibtop *server, size_t size, void *buf); void glibtop_write_s (glibtop *server, size_t size, void *buf);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

3
lib/Makefile.am
View File

@@ -1,4 +1,3 @@
LINK = $(LIBTOOL) --mode=link $(CC) $(CFLAGS) $(LDFLAGS) -o $@
INCLUDES = @INCLUDES@ INCLUDES = @INCLUDES@
@@ -9,7 +8,7 @@ libgtop_2_0_la_SOURCES = init.c open.c close.c command.c read.c \
sysdeps.c sysdeps.c
libgtop_2_0_la_LDFLAGS = $(LT_VERSION_INFO) libgtop_2_0_la_LDFLAGS = $(LT_VERSION_INFO)
libgtop_2_0_la_LIBADD = $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib) libgtop_2_0_la_LIBADD = $(GLIB_LIBS) $(top_builddir)/sysdeps/common/libgtop_common-2.0.la $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps-2.0.la $(sysdeps_suid_lib)
BUILT_SOURCES = lib.c BUILT_SOURCES = lib.c

3
lib/command.c
View File

@@ -26,7 +26,6 @@
#include <glibtop/read_data.h> #include <glibtop/read_data.h>
#include <glibtop/command.h> #include <glibtop/command.h>
#include <glibtop/xmalloc.h>
void * void *
glibtop_call_l (glibtop *server, unsigned command, size_t send_size, glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
@@ -66,7 +65,7 @@ glibtop_call_l (glibtop *server, unsigned command, size_t send_size,
recv_size); recv_size);
if (response.data_size) { if (response.data_size) {
void *ptr = g_malloc (server, response.data_size); void *ptr = g_malloc (response.data_size);
glibtop_read_l (server, response.data_size, ptr); glibtop_read_l (server, response.data_size, ptr);

1
lib/init.c
View File

@@ -22,7 +22,6 @@
*/ */
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/xmalloc.h>
#include <glibtop/sysdeps.h> #include <glibtop/sysdeps.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>

1
lib/inodedb.c
View File

@@ -23,7 +23,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/xmalloc.h>
#include <glibtop/inodedb.h> #include <glibtop/inodedb.h>
#include <pwd.h> #include <pwd.h>

3
lib/lib.pl
View File

@@ -20,11 +20,14 @@ print '/* lib.c */';
print "/* This is a generated file. Please modify `lib.pl' */"; print "/* This is a generated file. Please modify `lib.pl' */";
print ''; print '';
print '#include <config.h>';
print '';
print '#include <glibtop.h>'; print '#include <glibtop.h>';
print '#include <glibtop/open.h>'; print '#include <glibtop/open.h>';
print ''; print '';
print '#include <glibtop/sysdeps.h>'; print '#include <glibtop/sysdeps.h>';
print '#include <glibtop/union.h>'; print '#include <glibtop/union.h>';
print '#include <libgnome/gnome-i18n.h>';
print ''; print '';
print '#include <glibtop/command.h>'; print '#include <glibtop/command.h>';

1
lib/open.c
View File

@@ -26,7 +26,6 @@
#include <glibtop/version.h> #include <glibtop/version.h>
#include <glibtop/sysdeps.h> #include <glibtop/sysdeps.h>
#include <glibtop/command.h> #include <glibtop/command.h>
#include <glibtop/xmalloc.h>
#include <glibtop/gnuserv.h> #include <glibtop/gnuserv.h>

3
lib/read.c
View File

@@ -21,7 +21,10 @@
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
*/ */
#include <config.h>
#include <glibtop/read.h> #include <glibtop/read.h>
#include <libgnome/gnome-i18n.h>
/* Reads some data from server. */ /* Reads some data from server. */

6
lib/read_data.c
View File

@@ -21,8 +21,10 @@
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
*/ */
#include <glibtop/xmalloc.h> #include <config.h>
#include <glibtop/read_data.h> #include <glibtop/read_data.h>
#include <libgnome/gnome-i18n.h>
/* Reads some data from server. */ /* Reads some data from server. */
@@ -54,7 +56,7 @@ glibtop_read_data_l (glibtop *server)
if (!size) return NULL; if (!size) return NULL;
ptr = g_malloc (server, size); ptr = g_malloc (size);
if (server->socket) { if (server->socket) {
ret = recv (server->socket, ptr, size, 0); ret = recv (server->socket, ptr, size, 0);

4
lib/structures.pl
View File

@@ -65,7 +65,7 @@ print qq[\#define __GLIBTOP_STRUCTURES_H__];
print ''; print '';
print qq[\#include <glibtop.h>]; print qq[\#include <glibtop.h>];
print ''; print '';
print qq[BEGIN_LIBGTOP_DECLS]; print qq[G_BEGIN_DECLS];
print ''; print '';
for ($nr = 0; $nr < $structure_count; $nr++) { for ($nr = 0; $nr < $structure_count; $nr++) {
@@ -77,7 +77,7 @@ for ($nr = 0; $nr < $structure_count; $nr++) {
print ''; print '';
printf (qq[\#define %-40s\t%d\n], 'GLIBTOP_MAX_STRUCTURES', $structure_count); printf (qq[\#define %-40s\t%d\n], 'GLIBTOP_MAX_STRUCTURES', $structure_count);
print ''; print '';
print qq[END_LIBGTOP_DECLS]; print qq[G_END_DECLS];
print ''; print '';
print qq[\#endif /* __GLIBTOP_STRUCTURES_H__ */]; print qq[\#endif /* __GLIBTOP_STRUCTURES_H__ */];

3
lib/write.c
View File

@@ -21,7 +21,10 @@
Boston, MA 02111-1307, USA. Boston, MA 02111-1307, USA.
*/ */
#include <config.h>
#include <glibtop/write.h> #include <glibtop/write.h>
#include <libgnome/gnome-i18n.h>
/* Writes some data to server. */ /* Writes some data to server. */

6
src/daemon/ChangeLog
View File

@@ -1,3 +1,9 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* Makefile.am:
* daemon.h:
* gnuserv.c: (main): fixed compilation
2003-10-20 Bastien Nocera <hadess@hadess.net> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* main.c: (handle_parent_connection): * main.c: (handle_parent_connection):

2
src/daemon/Makefile.am
View File

@@ -43,7 +43,7 @@ libgtop_daemon2_LDADD = $(top_builddir)/lib/libgtop-2.0.la \
@libs_xauth@ @libs_xauth@
libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h libgtop_server2_SOURCES = server.c slave.c io.c version.c daemon.h
libgtop_server2_LDADD = $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \ libgtop_server2_LDADD = $(GLIB_LIBS) $(top_builddir)/sysdeps/@sysdeps_dir@/libgtop_sysdeps_suid-2.0.la \
$(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la $(top_builddir)/sysdeps/common/libgtop_suid_common-2.0.la
EXTRA_DIST = server_config.h.in server_config.pl EXTRA_DIST = server_config.h.in server_config.pl

5
src/daemon/daemon.h
View File

@@ -30,7 +30,6 @@
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/union.h> #include <glibtop/union.h>
#include <glibtop/xmalloc.h>
#include <glibtop/version.h> #include <glibtop/version.h>
#include <glibtop/command.h> #include <glibtop/command.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>
@@ -40,7 +39,7 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <syslog.h> #include <syslog.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
/* Some don't have LOG_PERROR */ /* Some don't have LOG_PERROR */
#ifndef LOG_PERROR #ifndef LOG_PERROR
@@ -76,6 +75,6 @@ void syslog_io_message (int priority, char *format, ...);
extern int enable_debug; extern int enable_debug;
extern int verbose_output; extern int verbose_output;
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

9
src/daemon/gnuserv.c
View File

@@ -29,11 +29,14 @@
* ../etc/gnuserv.README relative to the directory containing this file) * ../etc/gnuserv.README relative to the directory containing this file)
*/ */
#include <config.h>
#include <libgnome/gnome-i18n.h>
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/close.h> #include <glibtop/close.h>
#include <glibtop/command.h> #include <glibtop/command.h>
#include <glibtop/xmalloc.h>
#include <glibtop/parameter.h> #include <glibtop/parameter.h>
@@ -461,7 +464,7 @@ const struct poptOption popt_options [] = {
}; };
int int
main (int argc, char *argv []) main (int argc, const char **argv)
{ {
const unsigned method = GLIBTOP_METHOD_PIPE; const unsigned method = GLIBTOP_METHOD_PIPE;
const unsigned long features = GLIBTOP_SYSDEPS_ALL; const unsigned long features = GLIBTOP_SYSDEPS_ALL;
@@ -475,7 +478,7 @@ main (int argc, char *argv [])
if (!program_invocation_name) { if (!program_invocation_name) {
char *arg; char *arg;
program_invocation_name = argv[0]; program_invocation_name = (char *) argv[0];
arg = strrchr (argv[0], '/'); arg = strrchr (argv[0], '/');
program_invocation_short_name = program_invocation_short_name =
arg ? (arg + 1) : program_invocation_name; arg ? (arg + 1) : program_invocation_name;

11
sysdeps/aix/ChangeLog
View File

@@ -1,3 +1,14 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop_machine.h:
* glibtop_server.h:
* glibtop_suid.h:
* procargs.c:
* proclist.c:
* procmap.c:
* utils.c:
* utils.h: fixed compilation
2003-10-20 Bastien Nocera <hadess@hadess.net> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* procargs.c: (glibtop_get_proc_args_s): * procargs.c: (glibtop_get_proc_args_s):

4
sysdeps/aix/glibtop_machine.h
View File

@@ -26,7 +26,7 @@
#include <procinfo.h> #include <procinfo.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
typedef struct _glibtop_machine glibtop_machine; typedef struct _glibtop_machine glibtop_machine;
@@ -48,6 +48,6 @@ struct _glibtop_machine
struct procsinfo last_pinfo; struct procsinfo last_pinfo;
}; };
END_LIBGTOP_DECLS G_END_DECLS
#endif /* __GLIBTOP_MACHINE_H__ */ #endif /* __GLIBTOP_MACHINE_H__ */

4
sysdeps/aix/glibtop_server.h
View File

@@ -24,7 +24,7 @@
#ifndef __GLIBTOP_SERVER_H__ #ifndef __GLIBTOP_SERVER_H__
#define __GLIBTOP_SERVER_H__ #define __GLIBTOP_SERVER_H__
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_SUID_CPU (1 << GLIBTOP_SYSDEPS_CPU) #define GLIBTOP_SUID_CPU (1 << GLIBTOP_SYSDEPS_CPU)
#define GLIBTOP_SUID_MEM 0 #define GLIBTOP_SUID_MEM 0
@@ -47,6 +47,6 @@ BEGIN_LIBGTOP_DECLS
#define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD) #define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD)
#define GLIBTOP_SUID_PPP 0 #define GLIBTOP_SUID_PPP 0
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
sysdeps/aix/glibtop_suid.h
View File

@@ -24,7 +24,7 @@
#ifndef __GLIBTOP_SUID_H__ #ifndef __GLIBTOP_SUID_H__
#define __GLIBTOP_SUID_H__ #define __GLIBTOP_SUID_H__
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#if _IN_LIBGTOP #if _IN_LIBGTOP
#include <sys/param.h> #include <sys/param.h>
@@ -47,6 +47,6 @@ glibtop_open_p (glibtop *server, const char *program_name,
const unsigned long features, const unsigned long features,
const unsigned flags); const unsigned flags);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

1
sysdeps/aix/procargs.c
View File

@@ -25,7 +25,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/xmalloc.h>
#include <glibtop/procargs.h> #include <glibtop/procargs.h>
#include "utils.h" #include "utils.h"

1
sysdeps/aix/proclist.c
View File

@@ -24,7 +24,6 @@
#include <procinfo.h> #include <procinfo.h>
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/xmalloc.h>
#include <glibtop/proclist.h> #include <glibtop/proclist.h>
static const unsigned long _glibtop_sysdeps_proclist = static const unsigned long _glibtop_sysdeps_proclist =

1
sysdeps/aix/procmap.c
View File

@@ -24,7 +24,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/xmalloc.h>
#include <glibtop/procmap.h> #include <glibtop/procmap.h>
static const unsigned long _glibtop_sysdeps_proc_map = 0; static const unsigned long _glibtop_sysdeps_proc_map = 0;

1
sysdeps/aix/utils.c
View File

@@ -29,7 +29,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/xmalloc.h>
#include "glibtop_suid.h" #include "glibtop_suid.h"
#include "utils.h" #include "utils.h"

4
sysdeps/aix/utils.h
View File

@@ -24,7 +24,7 @@
#ifndef __UTILS_H__ #ifndef __UTILS_H__
#define __UTILS_H__ #define __UTILS_H__
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
extern off_t extern off_t
_glibtop_get_kmem_offset(glibtop* server, char* kname); _glibtop_get_kmem_offset(glibtop* server, char* kname);
@@ -40,6 +40,6 @@ extern int
_glibtop_vmgetinfo (void *out, int command, int arg); _glibtop_vmgetinfo (void *out, int command, int arg);
#endif #endif
END_LIBGTOP_DECLS G_END_DECLS
#endif /* __UTILS_H__ */ #endif /* __UTILS_H__ */

5
sysdeps/common/ChangeLog
View File

@@ -1,3 +1,8 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* inodedb.c:
* mountlist.c: (glibtop_get_mountlist_s): fixed compilation
2003-10-20 Bastien Nocera <hadess@hadess.net> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* Makefile.am: * Makefile.am:

1
sysdeps/common/inodedb.c
View File

@@ -23,7 +23,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/xmalloc.h>
#include <glibtop/inodedb.h> #include <glibtop/inodedb.h>
#include <pwd.h> #include <pwd.h>

107
sysdeps/common/mountlist.c
View File

@@ -19,6 +19,7 @@
#include <config.h> #include <config.h>
#endif #endif
#include <glib.h>
#include <stdio.h> #include <stdio.h>
#include <sys/types.h> #include <sys/types.h>
#include "mountlist.h" #include "mountlist.h"
@@ -35,20 +36,10 @@ void free ();
#endif #endif
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/xmalloc.h>
#include <glibtop/mountlist.h> #include <glibtop/mountlist.h>
static struct mount_entry *read_filesystem_list (int need_fs_type, int all_fs); static struct mount_entry *read_filesystem_list (int need_fs_type, int all_fs);
#undef xmalloc
#undef xrealloc
#undef xstrdup
#define xmalloc(p1) g_malloc (NULL, p1)
#define xrealloc(p1,p2) g_realloc (p1, p2)
#define xstrdup(p1) g_strdup (NULL, p1)
#define xfree(p1) g_free (NULL, p1)
#ifdef HAVE_SYS_PARAM_H #ifdef HAVE_SYS_PARAM_H
#include <sys/param.h> #include <sys/param.h>
#endif #endif
@@ -264,7 +255,7 @@ read_filesystem_list (need_fs_type, all_fs)
struct mount_entry *mtail; struct mount_entry *mtail;
/* Start the list off with a dummy entry. */ /* Start the list off with a dummy entry. */
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
me->me_next = NULL; me->me_next = NULL;
mount_list = mtail = me; mount_list = mtail = me;
@@ -284,10 +275,10 @@ read_filesystem_list (need_fs_type, all_fs)
p = mntlist; p = mntlist;
while(p){ while(p){
mnt = p->ment; mnt = p->ment;
me = (struct mount_entry*) xmalloc(sizeof (struct mount_entry)); me = (struct mount_entry*) g_malloc(sizeof (struct mount_entry));
me->me_devname = xstrdup(mnt->mnt_fsname); me->me_devname = g_strdup(mnt->mnt_fsname);
me->me_mountdir = xstrdup(mnt->mnt_dir); me->me_mountdir = g_strdup(mnt->mnt_dir);
me->me_type = xstrdup(mnt->mnt_type); me->me_type = g_strdup(mnt->mnt_type);
me->me_dev = -1; me->me_dev = -1;
me->me_next = NULL; me->me_next = NULL;
mtail->me_next = me; mtail->me_next = me;
@@ -315,10 +306,10 @@ read_filesystem_list (need_fs_type, all_fs)
|| !strcmp (mnt->mnt_type, "auto"))) || !strcmp (mnt->mnt_type, "auto")))
continue; continue;
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
me->me_devname = xstrdup (mnt->mnt_fsname); me->me_devname = g_strdup (mnt->mnt_fsname);
me->me_mountdir = xstrdup (mnt->mnt_dir); me->me_mountdir = g_strdup (mnt->mnt_dir);
me->me_type = xstrdup (mnt->mnt_type); me->me_type = g_strdup (mnt->mnt_type);
devopt = strstr (mnt->mnt_opts, "dev="); devopt = strstr (mnt->mnt_opts, "dev=");
if (devopt) if (devopt)
{ {
@@ -351,13 +342,13 @@ read_filesystem_list (need_fs_type, all_fs)
return NULL; return NULL;
while (entries-- > 0) while (entries-- > 0)
{ {
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
me->me_devname = xstrdup (fsp->f_mntfromname); me->me_devname = g_strdup (fsp->f_mntfromname);
me->me_mountdir = xstrdup (fsp->f_mntonname); me->me_mountdir = g_strdup (fsp->f_mntonname);
#if defined(__NetBSD__) || defined(__OpenBSD__) #if defined(__NetBSD__) || defined(__OpenBSD__)
me->me_type = xstrdup (fsp->f_fstypename); me->me_type = g_strdup (fsp->f_fstypename);
#else #else
me->me_type = xstrdup (fstype_to_string (fsp->f_type)); me->me_type = g_strdup (fstype_to_string (fsp->f_type));
#endif #endif
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
me->me_next = NULL; me->me_next = NULL;
@@ -379,10 +370,10 @@ read_filesystem_list (need_fs_type, all_fs)
while ((val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY, while ((val = getmnt (&offset, &fsd, sizeof (fsd), NOSTAT_MANY,
(char *) 0)) > 0) (char *) 0)) > 0)
{ {
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
me->me_devname = xstrdup (fsd.fd_req.devname); me->me_devname = g_strdup (fsd.fd_req.devname);
me->me_mountdir = xstrdup (fsd.fd_req.path); me->me_mountdir = g_strdup (fsd.fd_req.path);
me->me_type = xstrdup (gt_names[fsd.fd_req.fstype]); me->me_type = g_strdup (gt_names[fsd.fd_req.fstype]);
me->me_dev = fsd.fd_req.dev; me->me_dev = fsd.fd_req.dev;
me->me_next = NULL; me->me_next = NULL;
@@ -405,7 +396,7 @@ read_filesystem_list (need_fs_type, all_fs)
return (NULL); return (NULL);
bufsize = (1 + numsys) * sizeof (struct statfs); bufsize = (1 + numsys) * sizeof (struct statfs);
stats = (struct statfs *)xmalloc (bufsize); stats = (struct statfs *) g_malloc (bufsize);
numsys = getfsstat (stats, bufsize, MNT_WAIT); numsys = getfsstat (stats, bufsize, MNT_WAIT);
if (numsys < 0) if (numsys < 0)
@@ -416,10 +407,10 @@ read_filesystem_list (need_fs_type, all_fs)
for (counter = 0; counter < numsys; counter++) for (counter = 0; counter < numsys; counter++)
{ {
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
me->me_devname = xstrdup (stats[counter].f_mntfromname); me->me_devname = g_strdup (stats[counter].f_mntfromname);
me->me_mountdir = xstrdup (stats[counter].f_mntonname); me->me_mountdir = g_strdup (stats[counter].f_mntonname);
me->me_type = xstrdup (mnt_names[stats[counter].f_type]); me->me_type = g_strdup (mnt_names[stats[counter].f_type]);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
me->me_next = NULL; me->me_next = NULL;
@@ -444,17 +435,17 @@ read_filesystem_list (need_fs_type, all_fs)
while (fread (&mnt, sizeof mnt, 1, fp) > 0) while (fread (&mnt, sizeof mnt, 1, fp) > 0)
{ {
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
#ifdef GETFSTYP /* SVR3. */ #ifdef GETFSTYP /* SVR3. */
me->me_devname = xstrdup (mnt.mt_dev); me->me_devname = g_strdup (mnt.mt_dev);
#else #else
me->me_devname = xmalloc (strlen (mnt.mt_dev) + 6); me->me_devname = g_malloc (strlen (mnt.mt_dev) + 6);
strcpy (me->me_devname, "/dev/"); strcpy (me->me_devname, "/dev/");
strcpy (me->me_devname + 5, mnt.mt_dev); strcpy (me->me_devname + 5, mnt.mt_dev);
#endif #endif
me->me_mountdir = xstrdup (mnt.mt_filsys); me->me_mountdir = g_strdup (mnt.mt_filsys);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
me->me_type = xstrdup (""); me->me_type = g_strdup ("");
#ifdef GETFSTYP /* SVR3. */ #ifdef GETFSTYP /* SVR3. */
if (need_fs_type) if (need_fs_type)
{ {
@@ -463,7 +454,7 @@ read_filesystem_list (need_fs_type, all_fs)
if (statfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1 if (statfs (me->me_mountdir, &fsd, sizeof fsd, 0) != -1
&& sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1) && sysfs (GETFSTYP, fsd.f_fstyp, typebuf) != -1)
me->me_type = xstrdup (typebuf); me->me_type = g_strdup (typebuf);
} }
#endif #endif
me->me_next = NULL; me->me_next = NULL;
@@ -483,10 +474,10 @@ read_filesystem_list (need_fs_type, all_fs)
struct mntent **mnttbl=getmnttbl(),**ent; struct mntent **mnttbl=getmnttbl(),**ent;
for (ent=mnttbl;*ent;ent++) for (ent=mnttbl;*ent;ent++)
{ {
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
me->me_devname = xstrdup ( (*ent)->mt_resource); me->me_devname = g_strdup ( (*ent)->mt_resource);
me->me_mountdir = xstrdup( (*ent)->mt_directory); me->me_mountdir = g_strdup( (*ent)->mt_directory);
me->me_type = xstrdup ((*ent)->mt_fstype); me->me_type = g_strdup ((*ent)->mt_fstype);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
me->me_next = NULL; me->me_next = NULL;
@@ -511,10 +502,10 @@ read_filesystem_list (need_fs_type, all_fs)
while ((ret = getmntent (fp, &mnt)) == 0) while ((ret = getmntent (fp, &mnt)) == 0)
{ {
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
me->me_devname = xstrdup (mnt.mnt_special); me->me_devname = g_strdup (mnt.mnt_special);
me->me_mountdir = xstrdup (mnt.mnt_mountp); me->me_mountdir = g_strdup (mnt.mnt_mountp);
me->me_type = xstrdup (mnt.mnt_fstype); me->me_type = g_strdup (mnt.mnt_fstype);
me->me_dev = (dev_t) -1; /* Magic; means not known yet. */ me->me_dev = (dev_t) -1; /* Magic; means not known yet. */
me->me_next = NULL; me->me_next = NULL;
@@ -538,7 +529,7 @@ read_filesystem_list (need_fs_type, all_fs)
/* Ask how many bytes to allocate for the mounted filesystem info. */ /* Ask how many bytes to allocate for the mounted filesystem info. */
mntctl (MCTL_QUERY, sizeof bufsize, (struct vmount *) &bufsize); mntctl (MCTL_QUERY, sizeof bufsize, (struct vmount *) &bufsize);
entries = xmalloc (bufsize); entries = g_malloc (bufsize);
/* Get the list of mounted filesystems. */ /* Get the list of mounted filesystems. */
mntctl (MCTL_QUERY, bufsize, (struct vmount *) entries); mntctl (MCTL_QUERY, bufsize, (struct vmount *) entries);
@@ -547,7 +538,7 @@ read_filesystem_list (need_fs_type, all_fs)
thisent += vmp->vmt_length) thisent += vmp->vmt_length)
{ {
vmp = (struct vmount *) thisent; vmp = (struct vmount *) thisent;
me = (struct mount_entry *) xmalloc (sizeof (struct mount_entry)); me = (struct mount_entry *) g_malloc (sizeof (struct mount_entry));
if (vmp->vmt_flags & MNT_REMOTE) if (vmp->vmt_flags & MNT_REMOTE)
{ {
char *host, *path; char *host, *path;
@@ -555,18 +546,18 @@ read_filesystem_list (need_fs_type, all_fs)
/* Prepend the remote pathname. */ /* Prepend the remote pathname. */
host = thisent + vmp->vmt_data[VMT_HOSTNAME].vmt_off; host = thisent + vmp->vmt_data[VMT_HOSTNAME].vmt_off;
path = thisent + vmp->vmt_data[VMT_OBJECT].vmt_off; path = thisent + vmp->vmt_data[VMT_OBJECT].vmt_off;
me->me_devname = xmalloc (strlen (host) + strlen (path) + 2); me->me_devname = g_malloc (strlen (host) + strlen (path) + 2);
strcpy (me->me_devname, host); strcpy (me->me_devname, host);
strcat (me->me_devname, ":"); strcat (me->me_devname, ":");
strcat (me->me_devname, path); strcat (me->me_devname, path);
} }
else else
{ {
me->me_devname = xstrdup (thisent + me->me_devname = g_strdup (thisent +
vmp->vmt_data[VMT_OBJECT].vmt_off); vmp->vmt_data[VMT_OBJECT].vmt_off);
} }
me->me_mountdir = xstrdup (thisent + vmp->vmt_data[VMT_STUB].vmt_off); me->me_mountdir = g_strdup (thisent + vmp->vmt_data[VMT_STUB].vmt_off);
me->me_type = xstrdup (fstype_to_string (vmp->vmt_gfstype)); me->me_type = g_strdup (fstype_to_string (vmp->vmt_gfstype));
me->me_dev = (dev_t) -1; /* vmt_fsid might be the info we want. */ me->me_dev = (dev_t) -1; /* vmt_fsid might be the info we want. */
me->me_next = NULL; me->me_next = NULL;
@@ -613,7 +604,7 @@ glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)
buf->total = buf->number * buf->size; buf->total = buf->number * buf->size;
mount_list = g_malloc (server, buf->total); mount_list = g_malloc (buf->total);
/* Write data into mount_list. */ /* Write data into mount_list. */
@@ -634,10 +625,10 @@ glibtop_get_mountlist_s (glibtop *server, glibtop_mountlist *buf, int all_fs)
for (count = 0, tmp = me; tmp; count++, tmp = next) { for (count = 0, tmp = me; tmp; count++, tmp = next) {
next = tmp->me_next; next = tmp->me_next;
xfree (tmp->me_devname); g_free (tmp->me_devname);
xfree (tmp->me_mountdir); g_free (tmp->me_mountdir);
xfree (tmp->me_type); g_free (tmp->me_type);
xfree (tmp); g_free (tmp);
} }
return mount_list; return mount_list;

11
sysdeps/freebsd/ChangeLog
View File

@@ -1,3 +1,14 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop_machine.h:
* glibtop_server.h:
* glibtop_suid.h:
* open.c:
* procargs.c:
* proclist.c:
* procmap.c:
* swap.c: fixed compilation
2003-10-20 Bastien Nocera <hadess@hadess.net> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* procargs.c: (glibtop_get_proc_args_p): * procargs.c: (glibtop_get_proc_args_p):

4
sysdeps/freebsd/glibtop_machine.h
View File

@@ -39,7 +39,7 @@
#include <osreldate.h> #include <osreldate.h>
#endif #endif
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
typedef struct _glibtop_machine glibtop_machine; typedef struct _glibtop_machine glibtop_machine;
@@ -54,6 +54,6 @@ struct _glibtop_machine
kvm_t *kd; kvm_t *kd;
}; };
END_LIBGTOP_DECLS G_END_DECLS
#endif /* __GLIBTOP_MACHINE_H__ */ #endif /* __GLIBTOP_MACHINE_H__ */

4
sysdeps/freebsd/glibtop_server.h
View File

@@ -24,7 +24,7 @@
#ifndef __GLIBTOP_SERVER_H__ #ifndef __GLIBTOP_SERVER_H__
#define __GLIBTOP_SERVER_H__ #define __GLIBTOP_SERVER_H__
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_SUID_CPU (1 << GLIBTOP_SYSDEPS_CPU) #define GLIBTOP_SUID_CPU (1 << GLIBTOP_SYSDEPS_CPU)
#define GLIBTOP_SUID_MEM (1 << GLIBTOP_SYSDEPS_MEM) #define GLIBTOP_SUID_MEM (1 << GLIBTOP_SYSDEPS_MEM)
@@ -47,6 +47,6 @@ BEGIN_LIBGTOP_DECLS
#define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD) #define GLIBTOP_SUID_NETLOAD (1 << GLIBTOP_SYSDEPS_NETLOAD)
#define GLIBTOP_SUID_PPP (1 << GLIBTOP_SYSDEPS_PPP) #define GLIBTOP_SUID_PPP (1 << GLIBTOP_SYSDEPS_PPP)
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
sysdeps/freebsd/glibtop_suid.h
View File

@@ -24,7 +24,7 @@
#ifndef __GLIBTOP_SUID_H__ #ifndef __GLIBTOP_SUID_H__
#define __GLIBTOP_SUID_H__ #define __GLIBTOP_SUID_H__
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#if _IN_LIBGTOP #if _IN_LIBGTOP
#include <sys/param.h> #include <sys/param.h>
@@ -53,6 +53,6 @@ glibtop_open_p (glibtop *server, const char *program_name,
const unsigned long features, const unsigned long features,
const unsigned flags); const unsigned flags);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

1
sysdeps/freebsd/open.c
View File

@@ -23,7 +23,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/open.h> #include <glibtop/open.h>
#include <glibtop/xmalloc.h>
/* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */ /* !!! THIS FUNCTION RUNS SUID ROOT - CHANGE WITH CAUTION !!! */

1
sysdeps/freebsd/procargs.c
View File

@@ -23,7 +23,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/xmalloc.h>
#include <glibtop/procargs.h> #include <glibtop/procargs.h>
#include <glibtop_suid.h> #include <glibtop_suid.h>

1
sysdeps/freebsd/proclist.c
View File

@@ -23,7 +23,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/xmalloc.h>
#include <glibtop/proclist.h> #include <glibtop/proclist.h>
#include <glibtop_suid.h> #include <glibtop_suid.h>

1
sysdeps/freebsd/procmap.c
View File

@@ -23,7 +23,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/xmalloc.h>
#include <glibtop/procmap.h> #include <glibtop/procmap.h>
#include <glibtop_suid.h> #include <glibtop_suid.h>

2
sysdeps/freebsd/swap.c
View File

@@ -25,8 +25,6 @@
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/swap.h> #include <glibtop/swap.h>
#include <glibtop/xmalloc.h>
#include <glibtop_suid.h> #include <glibtop_suid.h>
static const unsigned long _glibtop_sysdeps_swap = static const unsigned long _glibtop_sysdeps_swap =

9
sysdeps/kernel/ChangeLog
View File

@@ -1,3 +1,12 @@
2003-10-20 Bastien Nocera <hadess@hadess.net>
* glibtop_private.h:
* glibtop_server.h:
* kernel.h:
* procargs.c:
* proclist.c:
* procmap.c: fixed compilation
2003-10-20 Bastien Nocera <hadess@hadess.net> 2003-10-20 Bastien Nocera <hadess@hadess.net>
* proclist.c: (glibtop_get_proclist_s): replace all the xmalloc crap * proclist.c: (glibtop_get_proclist_s): replace all the xmalloc crap

4
sysdeps/kernel/glibtop_private.h
View File

@@ -34,7 +34,7 @@
#undef LIBGTOP_VERSION #undef LIBGTOP_VERSION
#include <linux/libgtop.h> #include <linux/libgtop.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
int int
glibtop_get_proc_data_stat_s (glibtop *server, libgtop_stat_t *stat); glibtop_get_proc_data_stat_s (glibtop *server, libgtop_stat_t *stat);
@@ -84,6 +84,6 @@ glibtop_get_proc_data_netload_s (glibtop *server,
libgtop_netload_t *netload, libgtop_netload_t *netload,
const char *device); const char *device);
END_LIBGTOP_DECLS G_END_DECLS
#endif /* __GLIBTOP_PRIVATE_H__ */ #endif /* __GLIBTOP_PRIVATE_H__ */

4
sysdeps/kernel/glibtop_server.h
View File

@@ -24,7 +24,7 @@
#ifndef __GLIBTOP_SERVER_H__ #ifndef __GLIBTOP_SERVER_H__
#define __GLIBTOP_SERVER_H__ #define __GLIBTOP_SERVER_H__
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
#define GLIBTOP_SUID_CPU 0 #define GLIBTOP_SUID_CPU 0
#define GLIBTOP_SUID_MEM 0 #define GLIBTOP_SUID_MEM 0
@@ -47,6 +47,6 @@ BEGIN_LIBGTOP_DECLS
#define GLIBTOP_SUID_NETLOAD 0 #define GLIBTOP_SUID_NETLOAD 0
#define GLIBTOP_SUID_PPP 0 #define GLIBTOP_SUID_PPP 0
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

4
sysdeps/kernel/kernel.h
View File

@@ -31,10 +31,10 @@
#include <syscall.h> #include <syscall.h>
BEGIN_LIBGTOP_DECLS G_BEGIN_DECLS
extern int table (int, union table *, const void *); extern int table (int, union table *, const void *);
END_LIBGTOP_DECLS G_END_DECLS
#endif #endif

1
sysdeps/kernel/procargs.c
View File

@@ -23,7 +23,6 @@
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/error.h> #include <glibtop/error.h>
#include <glibtop/xmalloc.h>
#include <glibtop/procargs.h> #include <glibtop/procargs.h>
static const unsigned long _glibtop_sysdeps_proc_args = 0; static const unsigned long _glibtop_sysdeps_proc_args = 0;

1
sysdeps/kernel/proclist.c
View File

@@ -22,7 +22,6 @@
*/ */
#include <glibtop.h> #include <glibtop.h>
#include <glibtop/xmalloc.h>
#include <glibtop/proclist.h> #include <glibtop/proclist.h>
#include "kernel.h" #include "kernel.h"

Some files were not shown because too many files have changed in this diff Show More