diff options
| author | Martin Baulig <martin@src.gnome.org> | 2000-01-02 16:20:15 +0000 |
|---|---|---|
| committer | Martin Baulig <martin@src.gnome.org> | 2000-01-02 16:20:15 +0000 |
| commit | fa5d2af7eac87643a533533b2ca9f2fa094f94ba (patch) | |
| tree | d29a9b18990cac3a8af42a8d94ed0cdbf1dfb254 | |
| parent | e0d9f28674e7a5d9359558dafe085bb75ce89369 (diff) | |
| download | libgtop-fa5d2af7eac87643a533533b2ca9f2fa094f94ba.tar.gz | |
*** empty log message ***
| -rw-r--r-- | backends/server/command.c | 2 | ||||
| -rw-r--r-- | backends/server/demarshal.pl | 2 | ||||
| -rw-r--r-- | backends/server/server.c | 2 | ||||
| -rw-r--r-- | backends/server/server.h | 3 | ||||
| -rw-r--r-- | scripts/c_types.pl | 10 |
5 files changed, 13 insertions, 6 deletions
diff --git a/backends/server/command.c b/backends/server/command.c index 9dfefdae..4d3fbdcb 100644 --- a/backends/server/command.c +++ b/backends/server/command.c @@ -41,7 +41,9 @@ glibtop_call_i (glibtop *server, glibtop_backend *backend, unsigned command, int *retval_ptr) { glibtop_command cmnd; +#if 0 int retval; +#endif glibtop_init_r (&server, 0, 0); diff --git a/backends/server/demarshal.pl b/backends/server/demarshal.pl index 844f7d73..599b3248 100644 --- a/backends/server/demarshal.pl +++ b/backends/server/demarshal.pl @@ -34,7 +34,7 @@ print ''; print '#include <glibtop/backend.h>'; print ''; print '#include <glibtop-backend-private.h>'; -print '#include "command.h"'; +print '#include "server.h"'; print ''; $feature_count = 0; diff --git a/backends/server/server.c b/backends/server/server.c index 74edf71e..27e17c84 100644 --- a/backends/server/server.c +++ b/backends/server/server.c @@ -115,7 +115,7 @@ handle_slave_connection (int input, int output) while (do_read (input, cmnd, sizeof (glibtop_command))) { fprintf (stderr, "Slave %d received command " - "%d from client.\n", getpid (), cmnd->command); + "%ld from client.\n", getpid (), (long) cmnd->command); if (cmnd->send_size >= BUFSIZ) glibtop_error ("Client sent %d bytes, but buffer is %d", diff --git a/backends/server/server.h b/backends/server/server.h index 4a350597..9d42c0dc 100644 --- a/backends/server/server.h +++ b/backends/server/server.h @@ -70,6 +70,9 @@ BEGIN_LIBGTOP_DECLS #define GET_MAX_FDS() 256 #endif +int +do_read (int s, void *ptr, size_t total_size); + void handle_slave_connection (int input, int output); diff --git a/scripts/c_types.pl b/scripts/c_types.pl index bd568efe..d9f4a952 100644 --- a/scripts/c_types.pl +++ b/scripts/c_types.pl @@ -3,7 +3,7 @@ my $c_strlen_func = sub { local ($_) = @_; - return "strlen ($_) + sizeof (unsigned) + 1"; + return "strlen ($_) + 1"; }; my $c_marshal_func = sub { @@ -13,10 +13,12 @@ my $c_marshal_func = sub { $code .= sprintf ("%s_LIBGTOP_SEND_temp_len = strlen (%s)+1;\n", $indent, $param); $code .= sprintf ("%smemcpy (_LIBGTOP_SEND_ptr, %s, %s);\n", - $indent, "&_LIBGTOP_SEND_temp_len", "sizeof (unsigned)"); - $code .= sprintf ("%s_LIBGTOP_SEND_ptr += sizeof (unsigned);\n", $indent); - $code .= sprintf ("%smemcpy (_LIBGTOP_SEND_ptr, %s, %s);\n", + $indent, "&_LIBGTOP_SEND_temp_len", "sizeof (size_t)"); + $code .= sprintf ("%s_LIBGTOP_SEND_ptr += sizeof (size_t);\n", $indent); + $code .= sprintf ("%smemcpy (_LIBGTOP_DATA_ptr, %s, %s);\n", $indent, $param, "strlen ($param)+1"); + $code .= sprintf ("%s_LIBGTOP_DATA_ptr += strlen ($param)+1;\n", + $indent); $need_temp_len = 1; |