X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=ui%2Ftwin%2Fpbt-client.c;h=ed12e5a993a7d381550d4eac54e70f13d3f8263b;hp=8d7991a415d9370e42205d83fc328a7b0b50d6ee;hb=e01ca9726e5ce96605cb57595999885fde18884b;hpb=52b9db95764fcdee9195113d7df225634a19c9f4

diff --git a/ui/twin/pbt-client.c b/ui/twin/pbt-client.c
index 8d7991a..ed12e5a 100644
--- a/ui/twin/pbt-client.c
+++ b/ui/twin/pbt-client.c
@@ -46,6 +46,7 @@ void pbt_frame_status_printf(struct pbt_frame *frame, const char *format, ...)
 
 	va_start(ap, format);
 	// TODO
+	(void)frame;
 	va_end(ap);
 }
 
@@ -184,12 +185,11 @@ static void pbt_device_remove(struct device *dev, struct pbt_client *client)
 {
 	struct pbt_frame *const frame = &client->frame;
 	struct list *i_list = frame->top_menu->item_list;
+	twin_window_t *last_window = NULL;
 	struct pbt_item *removed_item;
 	struct pbt_item *prev_item;
 	struct pbt_item *next_item;
 	struct pbt_item *i;
-	twin_window_t *last_window;
-	struct boot_option *opt;
 
 	pb_log("%s: %p %s: n_options %d\n", __func__, dev, dev->id,
 		dev->n_options);
@@ -289,12 +289,12 @@ struct pbt_client *pbt_client_init(enum pbt_twin_backend backend,
 		goto fail_scr_init;
 
 	/* Loop here for scripts that just started the server. */
-if (1) {
-start_deamon:
-	for (i = 10; i; i--) {
+
+retry_start:
+	for (i = start_deamon ? 2 : 10; i; i--) {
 		pbt_client->discover_client
 			= discover_client_init(&pbt_client_ops, pbt_client);
-		if (pbt_client->discover_client)
+		if (pbt_client->discover_client || !i)
 			break;
 		pb_log("%s: waiting for server %d\n", __func__, i);
 		sleep(1);
@@ -308,7 +308,7 @@ start_deamon:
 		result = pb_start_daemon();
 
 		if (!result)
-			goto start_deamon;
+			goto retry_start;
 
 		pb_log("%s: discover_client_init failed.\n", __func__);
 		fprintf(stderr, "%s: error: discover_client_init failed.\n",
@@ -330,7 +330,7 @@ start_deamon:
 	waiter_register(discover_client_get_fd(pbt_client->discover_client),
 		WAIT_IN, (waiter_cb)discover_client_process,
 		pbt_client->discover_client);
-}
+
 	return pbt_client;
 
 fail_client_init: