@@ -377,7 +377,7 @@ int device_handler_event(struct device_h
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;
@@ -18,6 +18,7 @@
#include "log.h"
#include "waiter.h"
#include "device-handler.h"
+#include "discover-server.h"
struct discover_server {
int socket;
@@ -1,6 +1,5 @@
#include <stdarg.h>
-#include <stdio.h>
#include "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 */
@@ -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);
@@ -10,7 +10,7 @@
static int running;
-void sigint_handler(int signum)
+static void sigint_handler(int __attribute__((unused)) signum)
{
running = 0;
}
@@ -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 *p
* @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(voi
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
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_
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_d
{
struct device *dev;
char *pos;
- int i, n_options, len;
+ int i, n_options;
+ unsigned int len;
len = message->payload_len;
pos = message->payload;
Fix various minor build warnings: lib/pb-protocol/pb-protocol.c:72: warning: comparison between signed and unsigned lib/pb-protocol/pb-protocol.c:78: warning: comparison between signed and unsigned lib/pb-protocol/pb-protocol.c:141: warning: unused parameter 'buf_len' lib/pb-protocol/pb-protocol.c:241: warning: comparison between signed and unsigned discover/pb-discover.c:14: warning: no previous prototype for 'sigint_handler' discover/pb-discover.c:13: warning: unused parameter 'signum' discover/log.c:22: warning: no previous prototype for 'pb_log_set_stream' discover/discover-server.c:159: warning: no previous prototype for 'discover_server_notify_add' discover/discover-server.c:169: warning: no previous prototype for 'discover_server_notify_remove' discover/discover-server.c:179: warning: no previous prototype for 'discover_server_set_device_source' discover/discover-server.c:184: warning: no previous prototype for 'discover_server_init' discover/discover-server.c:229: warning: no previous prototype for 'discover_server_destroy' discover/device-handler.c:395: warning: comparison between signed and unsigned discover/paths.c:44: warning: comparison between signed and unsigned Signed-off-by: Geoff Levand <geoffrey.levand@am.sony.com> --- discover/device-handler.c | 2 +- discover/discover-server.c | 1 + discover/log.c | 1 - discover/log.h | 3 +++ discover/paths.c | 2 +- discover/pb-discover.c | 2 +- lib/pb-protocol/pb-protocol.c | 13 +++++++++---- 7 files changed, 16 insertions(+), 8 deletions(-)