X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdiscover-server.c;h=47ab4945e2df3071b2f35899cdff48b9badd0f50;hp=8ec1949121fd76f89819fc635c7b530f4ecd03c1;hb=fa6b8cb1d5e9e586370631b879a36cdf49110504;hpb=ce5eab024583af5a4725503bad6ed2aee452b1aa

diff --git a/discover/discover-server.c b/discover/discover-server.c
index 8ec1949..47ab494 100644
--- a/discover/discover-server.c
+++ b/discover/discover-server.c
@@ -11,13 +11,14 @@
 #include <asm/byteorder.h>
 
 #include <talloc/talloc.h>
+#include <waiter/waiter.h>
+#include <log/log.h>
 
 #include "pb-protocol/pb-protocol.h"
 #include "list/list.h"
 
-#include "log.h"
-#include "waiter.h"
 #include "device-handler.h"
+#include "discover-server.h"
 
 struct discover_server {
 	int socket;
@@ -65,17 +66,18 @@ static void print_clients(struct discover_server *server)
 {
 	struct client *client;
 
-	printf("current clients [%p,%p,%p]:\n",
+	pb_log("current clients [%p,%p,%p]:\n",
 			&server->clients.head,
 			server->clients.head.prev,
 			server->clients.head.next);
 	list_for_each_entry(&server->clients, client, list)
-		printf("\t[%p,%p,%p] client: %d\n", &client->list,
+		pb_log("\t[%p,%p,%p] client: %d\n", &client->list,
 				client->list.prev, client->list.next,
 				client->fd);
 }
 
-static int client_write_message(struct discover_server *server,
+static int client_write_message(
+		struct discover_server *server __attribute__((unused)),
 		struct client *client, struct pb_protocol_message *message)
 {
 	int rc;
@@ -88,7 +90,7 @@ static int client_write_message(struct discover_server *server,
 }
 
 static int write_add_message(struct discover_server *server,
-		struct client *client, struct device *dev)
+		struct client *client, const struct device *dev)
 {
 	struct pb_protocol_message *message;
 	int len;
@@ -126,7 +128,7 @@ static int write_remove_message(struct discover_server *server,
 static int discover_server_process(void *arg)
 {
 	struct discover_server *server = arg;
-	struct device *devices;
+	const struct device *devices;
 	struct client *client;
 	int fd, i, n_devices;