diff options
| -rw-r--r-- | discover/device-handler.c | 2 | ||||
| -rw-r--r-- | discover/discover-server.c | 1 | ||||
| -rw-r--r-- | discover/log.c | 1 | ||||
| -rw-r--r-- | discover/log.h | 3 | ||||
| -rw-r--r-- | discover/paths.c | 2 | ||||
| -rw-r--r-- | discover/pb-discover.c | 2 | ||||
| -rw-r--r-- | lib/pb-protocol/pb-protocol.c | 13 |
7 files changed, 16 insertions, 8 deletions
diff --git a/discover/device-handler.c b/discover/device-handler.c index c7e0227..8d3e877 100644 --- a/discover/device-handler.c +++ b/discover/device-handler.c @@ -377,7 +377,7 @@ int device_handler_event(struct device_handler *handler, struct device_handler *device_handler_init(struct discover_server *server) { struct device_handler *handler; - int i; + unsigned int i; handler = talloc(NULL, struct device_handler); handler->devices = NULL; diff --git a/discover/discover-server.c b/discover/discover-server.c index 8ec1949..8d72838 100644 --- a/discover/discover-server.c +++ b/discover/discover-server.c @@ -18,6 +18,7 @@ #include "log.h" #include "waiter.h" #include "device-handler.h" +#include "discover-server.h" struct discover_server { int socket; diff --git a/discover/log.c b/discover/log.c index 189f31e..e006fd0 100644 --- a/discover/log.c +++ b/discover/log.c @@ -1,6 +1,5 @@ #include <stdarg.h> -#include <stdio.h> #include "log.h" diff --git a/discover/log.h b/discover/log.h index 7f9b01f..3e92555 100644 --- a/discover/log.h +++ b/discover/log.h @@ -1,6 +1,9 @@ #ifndef _LOG_H #define _LOG_H +#include <stdio.h> + void pb_log(const char *fmt, ...); +void pb_log_set_stream(FILE *stream); #endif /* _LOG_H */ diff --git a/discover/paths.c b/discover/paths.c index 72d07b2..5b550fa 100644 --- a/discover/paths.c +++ b/discover/paths.c @@ -35,7 +35,7 @@ const char *mount_base(void) char *encode_label(void *alloc_ctx, const char *label) { char *str, *c; - int i; + unsigned int i; /* the label can be expanded by up to four times */ str = talloc_size(alloc_ctx, strlen(label) * 4 + 1); diff --git a/discover/pb-discover.c b/discover/pb-discover.c index 024cb30..56602d9 100644 --- a/discover/pb-discover.c +++ b/discover/pb-discover.c @@ -10,7 +10,7 @@ static int running; -void sigint_handler(int signum) +static void sigint_handler(int __attribute__((unused)) signum) { running = 0; } diff --git a/lib/pb-protocol/pb-protocol.c b/lib/pb-protocol/pb-protocol.c index 4981e95..d5f8b2f 100644 --- a/lib/pb-protocol/pb-protocol.c +++ b/lib/pb-protocol/pb-protocol.c @@ -1,4 +1,5 @@ +#include <assert.h> #include <string.h> #include <stdint.h> #include <asm/byteorder.h> @@ -65,7 +66,7 @@ int pb_protocol_serialise_string(char *pos, const char *str) * @param[out] str Pointer to resuling string * @return zero on success, non-zero on failure */ -static int read_string(void *ctx, char **pos, int *len, char **str) +static int read_string(void *ctx, char **pos, unsigned int *len, char **str) { uint32_t str_len, read_len; @@ -96,7 +97,7 @@ char *pb_protocol_deserialise_string(void *ctx, struct pb_protocol_message *message) { char *buf, *str; - int len; + unsigned int len; len = message->payload_len; buf = message->payload; @@ -172,6 +173,8 @@ int pb_protocol_serialise_device(struct device *dev, char *buf, int buf_len) pos += pb_protocol_serialise_string(pos, opt->boot_args); } + assert(pos <= buf + buf_len); + return 0; } @@ -221,7 +224,8 @@ struct pb_protocol_message *pb_protocol_create_message(void *ctx, struct pb_protocol_message *pb_protocol_read_message(void *ctx, int fd) { struct pb_protocol_message *message, m; - int rc, len; + int rc; + unsigned int len; /* use the stack for the initial 8-byte read */ @@ -258,7 +262,8 @@ struct device *pb_protocol_deserialise_device(void *ctx, { struct device *dev; char *pos; - int i, n_options, len; + int i, n_options; + unsigned int len; len = message->payload_len; pos = message->payload; |
