diff options
author | Benoît Dejean <bdejean@src.gnome.org> | 2004-07-07 19:13:03 +0000 |
---|---|---|
committer | Benoît Dejean <bdejean@src.gnome.org> | 2004-07-07 19:13:03 +0000 |
commit | babe152ba2169ef58011aa363b81a8f4546e87d6 (patch) | |
tree | ae41eafe0c7495e7c7728fc108af1f9485fd95c5 | |
parent | 7612022e8340c66fda7d5c9ffe346675c459aced (diff) | |
download | libgtop-babe152ba2169ef58011aa363b81a8f4546e87d6.tar.gz |
Removed netinfo.[ch] that were never used.
* include/glibtop/netinfo.h:
* structures.def:
* sysdeps/names/netinfo.c: Removed netinfo.[ch] that were never used.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | include/glibtop/netinfo.h | 83 | ||||
-rw-r--r-- | structures.def | 2 | ||||
-rw-r--r-- | sysdeps/names/netinfo.c | 56 |
4 files changed, 7 insertions, 140 deletions
@@ -1,3 +1,9 @@ +2004-07-07 Benoît Dejean <tazforever@dlfp.org> + + * include/glibtop/netinfo.h: + * structures.def: + * sysdeps/names/netinfo.c: Removed netinfo.[ch] that were never used. + 2004-07-03 Benoît Dejean <tazforever@dlfp.org> * sysdeps/names/fsusage.c: Added missing fsusage names. diff --git a/include/glibtop/netinfo.h b/include/glibtop/netinfo.h deleted file mode 100644 index 0296f710..00000000 --- a/include/glibtop/netinfo.h +++ /dev/null @@ -1,83 +0,0 @@ -/* -*- 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. -*/ - -#ifndef __GLIBTOP_NETINFO_H__ -#define __GLIBTOP_NETINFO_H__ - -#include <glibtop.h> -#include <glibtop/global.h> - -G_BEGIN_DECLS - -#define GLIBTOP_NETINFO_IF_FLAGS 0 -#define GLIBTOP_NETINFO_TRANSPORT 1 -#define GLIBTOP_NETINFO_MTU 2 -#define GLIBTOP_NETINFO_SUBNET 3 -#define GLIBTOP_NETINFO_ADDRESS 4 - -#define GLIBTOP_MAX_NETINFO 5 - -typedef struct _glibtop_netinfo glibtop_netinfo; - -#include <glibtop/interfaces.h> - -struct _glibtop_netinfo -{ - guint64 flags, - if_flags, /* GLIBTOP_NETINFO_IF_FLAGS */ - transport, /* GLIBTOP_NETINFO_TRANSPORT */ - mtu; /* GLIBTOP_NETINFO_MTU */ -}; - -#if GLIBTOP_SUID_NETINFO -#define glibtop_get_netinfo_r glibtop_get_netinfo_p -#else -#define glibtop_get_netinfo_r glibtop_get_netinfo_s -#endif - -glibtop_ifaddr *glibtop_get_netinfo_l (glibtop_client *client, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport); - -#if GLIBTOP_SUID_NETINFO -int glibtop_init_netinfo_p (glibtop_server *server, glibtop_closure *closure); -glibtop_ifaddr *glibtop_get_netinfo_p (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport); -#else -int glibtop_init_netinfo_s (glibtop_server *server, glibtop_closure *closure); -glibtop_ifaddr *glibtop_get_netinfo_s (glibtop_server *server, glibtop_closure *closure, glibtop_array *array, glibtop_netinfo *buf, const char *interface, guint64 transport); -#endif - -#ifdef GLIBTOP_NAMES - -/* You need to link with -lgtop_names to get this stuff here. */ - -extern const char *glibtop_names_netinfo []; -extern const unsigned glibtop_types_netinfo []; -extern const char *glibtop_labels_netinfo []; -extern const char *glibtop_descriptions_netinfo []; - -#endif - -G_END_DECLS - -#endif diff --git a/structures.def b/structures.def index a2a98deb..2524abc3 100644 --- a/structures.def +++ b/structures.def @@ -1,5 +1,5 @@ glibtop_map_entry|ulong(flags,start,end,offset,perm,inode,device):string(filename) glibtop_mountentry|ulong(dev):string(devname,mountdir,type) glibtop_interface|ulong(flags,if_flags,transport,type,number,instance,num_logical):string(name) -glibtop_sysdeps|ulong(features,pointer_size,cpu,mem,swap,uptime,loadavg,shm_limits,msg_limits,sem_limits,proclist,proc_state,proc_uid,proc_mem,proc_time,proc_signal,proc_kernel,proc_segment,proc_args,proc_map,mountlist,fsusage,interface_names,netinfo,netload,ppp) +glibtop_sysdeps|ulong(features,pointer_size,cpu,mem,swap,uptime,loadavg,shm_limits,msg_limits,sem_limits,proclist,proc_state,proc_uid,proc_mem,proc_time,proc_signal,proc_kernel,proc_segment,proc_args,proc_map,mountlist,fsusage,interface_names,netload,ppp) glibtop_ifaddr|ulong(flags,transport):ushort(addr_len,address[GLIBTOP_IFADDR_LEN]):ulong(subnet,scope) diff --git a/sysdeps/names/netinfo.c b/sysdeps/names/netinfo.c deleted file mode 100644 index abaf4693..00000000 --- a/sysdeps/names/netinfo.c +++ /dev/null @@ -1,56 +0,0 @@ -/* -*- 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/netinfo.h> -#include "libgtop-i18n.h" - -const char *glibtop_names_netinfo[GLIBTOP_MAX_NETINFO] = -{ - "if_flags", "transport", "mtu", "subnet", "address" -}; - -const unsigned glibtop_types_netinfo[GLIBTOP_MAX_NETINFO] = -{ - GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG, - GLIBTOP_TYPE_ULONG, GLIBTOP_TYPE_ULONG -}; - -const char *glibtop_labels_netinfo[GLIBTOP_MAX_NETINFO] = -{ - N_ ("Interface Flags"), - N_ ("Transport Method"), - N_ ("MTU"), - N_ ("Subnet"), - N_ ("Address"), -}; - -const char *glibtop_descriptions_netinfo[GLIBTOP_MAX_NETINFO] = -{ - N_ ("Interface Flags"), - N_ ("Transport Method"), - N_ ("Maximum Transfer Unit"), - N_ ("Subnet"), - N_ ("Address"), -}; |