diff options
author | Benoît Dejean <bdejean@src.gnome.org> | 2005-02-15 12:48:34 +0000 |
---|---|---|
committer | Benoît Dejean <bdejean@src.gnome.org> | 2005-02-15 12:48:34 +0000 |
commit | 53c43e6e909dc180d805a8482824815d82c0102f (patch) | |
tree | d2ae39d550623dbed507d87a27ddcad5b482eae9 /src/daemon | |
parent | b43e879cc0409382950483de3adab3f464496886 (diff) | |
download | libgtop-53c43e6e909dc180d805a8482824815d82c0102f.tar.gz |
Removed some dead files. Don't install private headers.
* 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.
Diffstat (limited to 'src/daemon')
-rw-r--r-- | src/daemon/daemon.h | 1 | ||||
-rw-r--r-- | src/daemon/io.c | 1 | ||||
-rw-r--r-- | src/daemon/main.c | 16 | ||||
-rw-r--r-- | src/daemon/slave.c | 9 |
4 files changed, 14 insertions, 13 deletions
diff --git a/src/daemon/daemon.h b/src/daemon/daemon.h index f62cbe7c..a585b32c 100644 --- a/src/daemon/daemon.h +++ b/src/daemon/daemon.h @@ -25,7 +25,6 @@ #define __GLIBTOP_DAEMON_H__ #include <glibtop.h> -#include <glibtop/error.h> #include <glibtop/gnuserv.h> #include <glibtop/open.h> diff --git a/src/daemon/io.c b/src/daemon/io.c index aa38dd40..3f7d115d 100644 --- a/src/daemon/io.c +++ b/src/daemon/io.c @@ -22,6 +22,7 @@ */ #include "daemon.h" +#include <glibtop/error.h> void do_output (int s, glibtop_response *resp, off_t offset, diff --git a/src/daemon/main.c b/src/daemon/main.c index 0822bb7b..2cf9fa1e 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -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; } } diff --git a/src/daemon/slave.c b/src/daemon/slave.c index 6dd615f5..4d3762da 100644 --- a/src/daemon/slave.c +++ b/src/daemon/slave.c @@ -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; } |