diff options
Diffstat (limited to 'tools/common.c')
| -rw-r--r-- | tools/common.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tools/common.c b/tools/common.c index 38df751..2c248b9 100644 --- a/tools/common.c +++ b/tools/common.c @@ -30,7 +30,9 @@ * ***** END LICENSE BLOCK ***** */ +#ifdef HAVE_CONFIG_H #include "config.h" +#endif #include <stdio.h> #include <stdlib.h> @@ -179,7 +181,7 @@ struct poptOption connect_options[] = { "the username to login with", "username"}, {"password", 0, POPT_ARG_STRING, &amqp_password, 0, "the password to login with", "password"}, - { NULL, 0, 0, NULL, 0 } + { NULL, '\0', 0, NULL, 0, NULL, NULL } }; static void init_connection_info(struct amqp_connection_info *ci) @@ -329,7 +331,8 @@ amqp_bytes_t read_all(int fd) bytes.len = 0; for (;;) { - ssize_t res = read(fd, bytes.bytes+bytes.len, space-bytes.len); + ssize_t res = read(fd, (char *)bytes.bytes + bytes.len, + space-bytes.len); if (res == 0) break; @@ -358,7 +361,7 @@ void write_all(int fd, amqp_bytes_t data) die_errno(errno, "write"); data.len -= res; - data.bytes += res; + data.bytes = (char *)data.bytes + res; } } |