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

Removed some dead files. Don't install private headers.

Browse Source 
* backends/server/server.h:
	* configure.in:
	* glibtop.h:
	* include/glibtop/Makefile.am:
	* include/glibtop/gnuserv.h:
	* include/glibtop/open.h:
	* include/glibtop/read.h:
	* include/glibtop/read_data.h:
	* include/glibtop/types.h:
	* include/glibtop/write.h:
	* lib/close.c:
	* lib/init.c:
	* lib/lib.pl:
	* lib/open.c:
	* lib/parameter.c:
	* lib/read.c:
	* lib/read_data.c:
	* lib/write.c:
	* src/daemon/daemon.h:
	* src/daemon/io.c:
	* src/daemon/main.c: (handle_parent_connection):
	* src/daemon/slave.c: (handle_slave_connection),
	(handle_slave_command):
	* sysdeps/common/gnuslib.c:
	* sysdeps/solaris/glibtop_private.h: Removed some dead files.
	Don't install private headers.
This commit is contained in:
Benoît Dejean
2005-02-15 12:48:34 +00:00
parent b43e879cc0
commit 53c43e6e90
25 changed files with 60 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
ChangeLog
View File

@@ -1,3 +1,32 @@
2005-02-15 Benoît Dejean <TazForEver@dlfp.org>
* backends/server/server.h:
* configure.in:
* glibtop.h:
* include/glibtop/Makefile.am:
* include/glibtop/gnuserv.h:
* include/glibtop/open.h:
* include/glibtop/read.h:
* include/glibtop/read_data.h:
* include/glibtop/types.h:
* include/glibtop/write.h:
* lib/close.c:
* lib/init.c:
* lib/lib.pl:
* lib/open.c:
* lib/parameter.c:
* lib/read.c:
* lib/read_data.c:
* lib/write.c:
* src/daemon/daemon.h:
* src/daemon/io.c:
* src/daemon/main.c: (handle_parent_connection):
* src/daemon/slave.c: (handle_slave_connection),
(handle_slave_command):
* sysdeps/common/gnuslib.c:
* sysdeps/solaris/glibtop_private.h: Removed some dead files.
Don't install private headers.
2005-02-15 Benoît Dejean <TazForEver@dlfp.org>
* include/glibtop/error.h: Don't export private symbols.

1
backends/server/server.h
View File

@@ -27,7 +27,6 @@
#define __GLIBTOP_DAEMON_H__
#include <glibtop.h>
#include <glibtop/error.h>
#include <glibtop/open.h>
#include <glibtop/union.h>

4
configure.in
View File

@@ -8,7 +8,7 @@ AC_CANONICAL_SYSTEM
LIBGTOP_MAJOR_VERSION=2
LIBGTOP_MINOR_VERSION=9
LIBGTOP_MICRO_VERSION=91
LIBGTOP_MICRO_VERSION=92
LIBGTOP_VERSION=$LIBGTOP_MAJOR_VERSION.$LIBGTOP_MINOR_VERSION.$LIBGTOP_MICRO_VERSION
AM_INIT_AUTOMAKE(libgtop, $LIBGTOP_VERSION)
@@ -133,7 +133,7 @@ AM_CONDITIONAL(ENABLE_SHARED, test x$enable_static = xyes)
AC_SUBST(static_targets)
AC_SUBST(smp_examples)
GLIB_REQUIRED=2.4.0
GLIB_REQUIRED=2.6.0
PKG_CHECK_MODULES(GLIB, glib-2.0 >= $GLIB_REQUIRED)
AC_SUBST(GLIB_CFLAGS)

1
glibtop.h
View File

@@ -51,7 +51,6 @@ LIBGTOP_MICRO_VERSION >= (micro)))
#include <glibtop/global.h>
#include <glibtop_server.h>
#include <glibtop/types.h>
#ifdef HAVE_GLIBTOP_MACHINE_H
#include <glibtop_machine.h>

8
include/glibtop/Makefile.am
View File

@@ -3,9 +3,11 @@ glibtopdir = $(includedir)/libgtop-2.0/glibtop
glibtop_HEADERS = close.h loadavg.h prockernel.h procstate.h \
sem_limits.h uptime.h command.h mem.h proclist.h \
proctime.h shm_limits.h version.h cpu.h msg_limits.h \
procmem.h procuid.h swap.h write.h error.h open.h \
procsegment.h read.h sysdeps.h global.h \
procsignal.h read_data.h union.h types.h gnuserv.h \
procmem.h procuid.h swap.h \
procsegment.h sysdeps.h global.h \
procsignal.h union.h gnuserv.h \
parameter.h mountlist.h fsusage.h procmap.h signal.h \
inodedb.h sysinfo.h ppp.h procargs.h netload.h \
netlist.h procopenfiles.h
noinst_HEADERS = error.h write.h open.h read_data.h read.h

1
include/glibtop/gnuserv.h
View File

@@ -42,7 +42,6 @@ static char header_rcsid [] = "!Header: gnuserv.h,v 2.4 95/02/16 11:58:11 arup a
/* gnuserv should not be compiled using SOCKS */
#define DO_NOT_SOCKSIFY
#include <glibtop.h>
#include <glibtop/error.h>
#undef read
#undef write
#undef open

2
include/glibtop/open.h
View File

@@ -23,8 +23,6 @@
#define __GLIBTOP_OPEN_H__
#include <glibtop.h>
#include <glibtop/read.h>
#include <glibtop/error.h>
G_BEGIN_DECLS

1
include/glibtop/read.h
View File

@@ -25,7 +25,6 @@
#define __GLIBTOP_READ_H__
#include <glibtop.h>
#include <glibtop/error.h>
G_BEGIN_DECLS

1
include/glibtop/read_data.h
View File

@@ -25,7 +25,6 @@
#define __GLIBTOP_READ_DATA_H__
#include <glibtop.h>
#include <glibtop/error.h>
G_BEGIN_DECLS

38
include/glibtop/types.h
View File

@@ -1,38 +0,0 @@
/* $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_TYPES_H__
#define __GLIBTOP_TYPES_H__
G_BEGIN_DECLS
#define GLIBTOP_TYPE_LONG 1
#define GLIBTOP_TYPE_ULONG 2
#define GLIBTOP_TYPE_DOUBLE 3
#define GLIBTOP_TYPE_INT 4
#define GLIBTOP_TYPE_CHAR 5
#define GLIBTOP_TYPE_STRING 6
G_END_DECLS
#endif

1
include/glibtop/write.h
View File

@@ -25,7 +25,6 @@
#define __GLIBTOP_WRITE_H__
#include <glibtop.h>
#include <glibtop/error.h>
G_BEGIN_DECLS

1
lib/close.c
View File

@@ -23,6 +23,7 @@
#include <glibtop.h>
#include <glibtop/open.h>
#include <glibtop/error.h>
#include <glibtop/close.h>
#include <glibtop/command.h>

1
lib/init.c
View File

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

1
lib/lib.pl
View File

@@ -23,6 +23,7 @@ print '';
print '#include <config.h>';
print '';
print '#include <glibtop.h>';
print '#include <glibtop/error.h>';
print '#include <glibtop/open.h>';
print '';
print '#include <glibtop/sysdeps.h>';

2
lib/open.c
View File

@@ -23,6 +23,8 @@
#include <glibtop.h>
#include <glibtop/open.h>
#include <glibtop/read.h>
#include <glibtop/error.h>
#include <glibtop/version.h>
#include <glibtop/sysdeps.h>
#include <glibtop/command.h>

1
lib/parameter.c
View File

@@ -23,6 +23,7 @@
#include <glibtop.h>
#include <glibtop/parameter.h>
#include <glibtop/error.h>
#define _write_data(ptr,size) \
if ((data_ptr == NULL) || (data_size < size)) return -size; \

1
lib/read.c
View File

@@ -23,6 +23,7 @@
#include <config.h>
#include <glibtop/read.h>
#include <glibtop/error.h>
#include "libgtop-i18n.h"

1
lib/read_data.c
View File

@@ -23,6 +23,7 @@
#include <config.h>
#include <glibtop/error.h>
#include <glibtop/read_data.h>
#include "libgtop-i18n.h"

1
lib/write.c
View File

@@ -24,6 +24,7 @@
#include <config.h>
#include <glibtop/write.h>
#include <glibtop/error.h>
#include "libgtop-i18n.h"
/* Writes some data to server. */

1
src/daemon/daemon.h
View File

@@ -25,7 +25,6 @@
#define __GLIBTOP_DAEMON_H__
#include <glibtop.h>
#include <glibtop/error.h>
#include <glibtop/gnuserv.h>
#include <glibtop/open.h>

1
src/daemon/io.c
View File

@@ -22,6 +22,7 @@
*/
#include "daemon.h"
#include <glibtop/error.h>
void
do_output (int s, glibtop_response *resp, off_t offset,

16
src/daemon/main.c
View File

@@ -62,13 +62,13 @@ handle_parent_connection (int s)
while (do_read (s, cmnd, sizeof (glibtop_command))) {
if (enable_debug)
syslog_message (LOG_DEBUG,
"Parent (%d) received command %d from client.",
getpid (), (int)cmnd->command);
"Parent (%d) received command %llu from client.",
getpid (), cmnd->command);
if (cmnd->data_size >= BUFSIZ) {
syslog_message (LOG_WARNING,
"Client sent %d bytes, but buffer is %lu",
(int)cmnd->data_size, (unsigned long)BUFSIZ);
"Client sent %llu bytes, but buffer is %lu",
cmnd->data_size, (unsigned long)BUFSIZ);
return;
}
@@ -78,8 +78,8 @@ handle_parent_connection (int s)
if (cmnd->data_size) {
if (enable_debug)
syslog_message (LOG_DEBUG, "Client has %d bytes of data.",
(int) cmnd->data_size);
syslog_message (LOG_DEBUG, "Client has %llu bytes of data.",
cmnd->data_size);
do_read (s, parameter, cmnd->data_size);
@@ -229,8 +229,8 @@ handle_parent_connection (int s)
0, NULL);
break;
default:
syslog_message (LOG_ERR, "Parent received unknown command %d.",
(int)cmnd->command);
syslog_message (LOG_ERR, "Parent received unknown command %llu.",
cmnd->command);
break;
}
}

9
src/daemon/slave.c
View File

@@ -22,6 +22,7 @@
*/
#include "daemon.h"
#include <glibtop/error.h>
void
handle_slave_connection (int input, int output)
@@ -42,11 +43,11 @@ handle_slave_connection (int input, int output)
while (do_read (input, cmnd, sizeof (glibtop_command))) {
#ifdef SLAVE_DEBUG
fprintf (stderr, "Slave %d received command "
"%d from client.\n", getpid (), cmnd->command);
"%llu from client.\n", getpid (), cmnd->command);
#endif
if (cmnd->data_size >= BUFSIZ)
glibtop_error ("Client sent %d bytes, "
glibtop_error ("Client sent %llu bytes, "
"but buffer is %lu",
cmnd->size, (unsigned long)BUFSIZ);
@@ -56,7 +57,7 @@ handle_slave_connection (int input, int output)
if (cmnd->data_size) {
#ifdef SLAVE_DEBUG
fprintf (stderr, "Client has %d bytes of data.\n",
fprintf (stderr, "Client has %llu bytes of data.\n",
cmnd->data_size);
#endif
@@ -249,7 +250,7 @@ handle_slave_command (glibtop_command *cmnd, glibtop_response *resp,
break;
#endif
default:
glibtop_error ("Child received unknown command %d",
glibtop_error ("Child received unknown command %llu",
cmnd->command);
break;
}

1
sysdeps/common/gnuslib.c
View File

@@ -30,6 +30,7 @@
*/
#include <glibtop.h>
#include <glibtop/error.h>
#include <glibtop/gnuserv.h>
#include <fcntl.h>

1
sysdeps/solaris/glibtop_private.h
View File

@@ -25,7 +25,6 @@
#define __GLIBTOP_PRIVATE_H__
#include <glibtop.h>
#include <glibtop/error.h>
#include <sys/param.h>
#include <kstat.h>