From: Ray Strode Date: Wed, 3 Aug 2011 18:00:25 +0000 (-0400) Subject: Revert "Add --nowait option." X-Git-Tag: 0.8.4~27 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b7701d690a0ea1fda036d48aeda8ba85fd41257b;p=thirdparty%2Fplymouth.git Revert "Add --nowait option." This reverts commit c926bccd83ed1391df80adfecd1229b0327e1f11. It was an in-progress patch that I carelessly and erroneously pushed. --- diff --git a/src/client/ply-boot-client.c b/src/client/ply-boot-client.c index 21b8ce7d..d76d32dc 100644 --- a/src/client/ply-boot-client.c +++ b/src/client/ply-boot-client.c @@ -59,7 +59,6 @@ typedef struct ply_boot_client_response_handler_t handler; ply_boot_client_response_handler_t failed_handler; void *user_data; - bool nowait; } ply_boot_client_request_t; static void ply_boot_client_cancel_request (ply_boot_client_t *client, @@ -212,8 +211,7 @@ ply_boot_client_request_new (ply_boot_client_t *client, const char *request_argument, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { ply_boot_client_request_t *request; @@ -228,7 +226,6 @@ ply_boot_client_request_new (ply_boot_client_t *client, request->handler = handler; request->failed_handler = failed_handler; request->user_data = user_data; - request->nowait = nowait; return request; } @@ -436,15 +433,6 @@ ply_boot_client_send_request (ply_boot_client_t *client, } free (request_string); - if (request->nowait) - { - if (request->handler != NULL) - request->handler (request->user_data, client); - - request->handler = NULL; - request->failed_handler = NULL; - } - if (client->daemon_has_reply_watch == NULL) { assert (ply_list_get_length (client->requests_waiting_for_replies) == 0); @@ -480,7 +468,7 @@ ply_boot_client_process_pending_requests (ply_boot_client_t *client) if (ply_list_get_length (client->requests_to_send) == 0) { - if (client->daemon_can_take_request_watch != NULL) + if (client->daemon_has_reply_watch != NULL) { assert (client->loop != NULL); @@ -497,8 +485,7 @@ ply_boot_client_queue_request (ply_boot_client_t *client, const char *request_argument, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); assert (client->loop != NULL); @@ -530,8 +517,7 @@ ply_boot_client_queue_request (ply_boot_client_t *client, request = ply_boot_client_request_new (client, request_command, request_argument, - handler, failed_handler, user_data, - nowait); + handler, failed_handler, user_data); ply_list_append_data (client->requests_to_send, request); } } @@ -545,7 +531,7 @@ ply_boot_client_ping_daemon (ply_boot_client_t *client, assert (client != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_PING, - NULL, handler, failed_handler, user_data, false); + NULL, handler, failed_handler, user_data); } void @@ -553,13 +539,12 @@ ply_boot_client_update_daemon (ply_boot_client_t *client, const char *status, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_UPDATE, - status, handler, failed_handler, user_data, nowait); + status, handler, failed_handler, user_data); } void @@ -567,14 +552,13 @@ ply_boot_client_tell_daemon_to_change_root (ply_boot_client_t * const char *root_dir, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); assert (root_dir != NULL); ply_boot_client_queue_request(client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_NEWROOT, - root_dir, handler, failed_handler, user_data, nowait); + root_dir, handler, failed_handler, user_data); } void @@ -582,14 +566,13 @@ ply_boot_client_tell_daemon_to_display_message (ply_boot_client_t const char *message, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); assert (message != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_SHOW_MESSAGE, - message, handler, failed_handler, user_data, nowait); + message, handler, failed_handler, user_data); } void @@ -597,28 +580,26 @@ ply_boot_client_tell_daemon_to_hide_message (ply_boot_client_t const char *message, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); assert (message != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_HIDE_MESSAGE, - message, handler, failed_handler, user_data, nowait); + message, handler, failed_handler, user_data); } void ply_boot_client_tell_daemon_system_is_initialized (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_SYSTEM_INITIALIZED, - NULL, handler, failed_handler, user_data, nowait); + NULL, handler, failed_handler, user_data); } void @@ -633,7 +614,7 @@ ply_boot_client_ask_daemon_for_password (ply_boot_client_t *cli ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_PASSWORD, prompt, (ply_boot_client_response_handler_t) - handler, failed_handler, user_data, false); + handler, failed_handler, user_data); } void @@ -646,7 +627,7 @@ ply_boot_client_ask_daemon_for_cached_passwords (ply_boot_client_t ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_CACHED_PASSWORD, NULL, (ply_boot_client_response_handler_t) - handler, failed_handler, user_data, false); + handler, failed_handler, user_data); } void @@ -660,7 +641,7 @@ ply_boot_client_ask_daemon_question (ply_boot_client_t *c ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_QUESTION, prompt, (ply_boot_client_response_handler_t) - handler, failed_handler, user_data, false); + handler, failed_handler, user_data); } void @@ -674,7 +655,7 @@ ply_boot_client_ask_daemon_to_watch_for_keystroke (ply_boot_client_t * ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_KEYSTROKE, keys, (ply_boot_client_response_handler_t) - handler, failed_handler, user_data, false); + handler, failed_handler, user_data); } void @@ -682,66 +663,61 @@ ply_boot_client_ask_daemon_to_ignore_keystroke (ply_boot_client_t const char *keys, ply_boot_client_answer_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_KEYSTROKE_REMOVE, keys, (ply_boot_client_response_handler_t) - handler, failed_handler, user_data, nowait); + handler, failed_handler, user_data); } void ply_boot_client_tell_daemon_to_show_splash (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_SHOW_SPLASH, - NULL, handler, failed_handler, user_data, nowait); + NULL, handler, failed_handler, user_data); } void ply_boot_client_tell_daemon_to_hide_splash (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_HIDE_SPLASH, - NULL, handler, failed_handler, user_data, nowait); + NULL, handler, failed_handler, user_data); } void ply_boot_client_tell_daemon_to_deactivate (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_DEACTIVATE, - NULL, handler, failed_handler, user_data, nowait); + NULL, handler, failed_handler, user_data); } void ply_boot_client_tell_daemon_to_reactivate (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { assert (client != NULL); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_REACTIVATE, - NULL, handler, failed_handler, user_data, nowait); + NULL, handler, failed_handler, user_data); } void @@ -749,8 +725,7 @@ ply_boot_client_tell_daemon_to_quit (ply_boot_client_t *client, bool retain_splash, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { char arg[2] = ""; @@ -758,51 +733,47 @@ ply_boot_client_tell_daemon_to_quit (ply_boot_client_t *client, arg[0] = (char) (retain_splash != false); ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_QUIT, - arg, handler, failed_handler, user_data, nowait); + arg, handler, failed_handler, user_data); } void ply_boot_client_tell_daemon_to_progress_pause (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_PROGRESS_PAUSE, - NULL, handler, failed_handler, user_data, nowait); + NULL, handler, failed_handler, user_data); } void ply_boot_client_tell_daemon_to_progress_unpause (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_PROGRESS_UNPAUSE, - NULL, handler, failed_handler, user_data, nowait); + NULL, handler, failed_handler, user_data); } void ply_boot_client_ask_daemon_has_active_vt (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_HAS_ACTIVE_VT, - NULL, handler, failed_handler, user_data, nowait); + NULL, handler, failed_handler, user_data); } void ply_boot_client_tell_daemon_about_error (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait) + void *user_data) { ply_boot_client_queue_request (client, PLY_BOOT_PROTOCOL_REQUEST_TYPE_ERROR, - NULL, handler, failed_handler, user_data, nowait); + NULL, handler, failed_handler, user_data); } void diff --git a/src/client/ply-boot-client.h b/src/client/ply-boot-client.h index 74bbf552..78fdd214 100644 --- a/src/client/ply-boot-client.h +++ b/src/client/ply-boot-client.h @@ -57,26 +57,22 @@ void ply_boot_client_update_daemon (ply_boot_client_t *client, const char *new_status, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_change_root (ply_boot_client_t *client, const char *chroot_dir, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_display_message (ply_boot_client_t *client, const char *message, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_hide_message (ply_boot_client_t *client, const char *message, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_ask_daemon_for_password (ply_boot_client_t *client, const char *prompt, ply_boot_client_answer_handler_t handler, @@ -100,62 +96,51 @@ void ply_boot_client_ask_daemon_to_ignore_keystroke (ply_boot_client_t const char *keys, ply_boot_client_answer_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_system_is_initialized (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_show_splash (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_hide_splash (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_deactivate (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_reactivate (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_quit (ply_boot_client_t *client, bool retain_splash, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_progress_pause (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_tell_daemon_to_progress_unpause (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_ask_daemon_has_active_vt (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); void ply_boot_client_disconnect (ply_boot_client_t *client); void ply_boot_client_attach_to_event_loop (ply_boot_client_t *client, ply_event_loop_t *loop); void ply_boot_client_tell_daemon_about_error (ply_boot_client_t *client, ply_boot_client_response_handler_t handler, ply_boot_client_response_handler_t failed_handler, - void *user_data, - bool nowait); + void *user_data); #endif diff --git a/src/client/plymouth.c b/src/client/plymouth.c index 32d7f703..84fe6e30 100644 --- a/src/client/plymouth.c +++ b/src/client/plymouth.c @@ -49,7 +49,6 @@ typedef struct ply_event_loop_t *loop; ply_boot_client_t *client; ply_command_parser_t *command_parser; - bool nowait; char kernel_command_line[PLY_MAX_COMMAND_LINE_SIZE]; } state_t; @@ -300,8 +299,7 @@ on_password_answer (password_answer_state_t *answer_state, (WEXITSTATUS (exit_status) ? on_failure : on_success), (ply_boot_client_response_handler_t) on_failure, - answer_state->state, - false); + answer_state->state); } else ply_event_loop_exit (answer_state->state->loop, WEXITSTATUS (exit_status)); @@ -335,8 +333,7 @@ on_question_answer (question_answer_state_t *answer_state, on_success, (ply_boot_client_response_handler_t) on_failure, - answer_state->state, - false); + answer_state->state); else ply_event_loop_exit (answer_state->state->loop, 0); } @@ -348,8 +345,7 @@ on_question_answer (question_answer_state_t *answer_state, on_failure, (ply_boot_client_response_handler_t) on_failure, - answer_state->state, - false); + answer_state->state); else ply_event_loop_exit (answer_state->state->loop, 1); } @@ -524,8 +520,7 @@ on_password_request (state_t *state, on_password_request_execute, (ply_boot_client_response_handler_t) on_password_answer_failure, - password_answer_state, - false); + password_answer_state); } else { @@ -579,8 +574,7 @@ on_question_request (state_t *state, on_question_request_execute, (ply_boot_client_response_handler_t) on_question_answer_failure, - question_answer_state, - false); + question_answer_state); } else { @@ -606,7 +600,7 @@ on_display_message_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); free (text); } } @@ -629,7 +623,7 @@ on_hide_message_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); free (text); } } @@ -681,7 +675,7 @@ on_keystroke_ignore (state_t *state, (ply_boot_client_answer_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } static void @@ -692,7 +686,7 @@ on_progress_pause_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } @@ -704,7 +698,7 @@ on_progress_unpause_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } static void @@ -715,7 +709,7 @@ on_report_error_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } @@ -727,7 +721,7 @@ on_deactivate_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } static void @@ -738,7 +732,7 @@ on_reactivate_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } static void @@ -758,8 +752,7 @@ on_quit_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, - state->nowait); + on_failure, state); } static bool @@ -810,7 +803,7 @@ on_update_root_fs_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } @@ -820,7 +813,7 @@ on_update_root_fs_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } } @@ -832,7 +825,7 @@ on_show_splash_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } static void @@ -843,7 +836,7 @@ on_hide_splash_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } static void @@ -864,7 +857,7 @@ on_update_request (state_t *state, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, state, state->nowait); + on_failure, state); } } @@ -903,7 +896,6 @@ main (int argc, "update", "Tell boot daemon an update about boot progress", PLY_COMMAND_OPTION_TYPE_STRING, "details", "Tell boot daemon there were errors during boot", PLY_COMMAND_OPTION_TYPE_FLAG, "wait", "Wait for boot daemon to quit", PLY_COMMAND_OPTION_TYPE_FLAG, - "nowait", "Don't wait for boot daemon to reply", PLY_COMMAND_OPTION_TYPE_FLAG, NULL); ply_command_parser_add_command (state.command_parser, @@ -1060,7 +1052,6 @@ main (int argc, "ignore-keystroke", &ignore_keystroke, "update", &status, "wait", &should_wait, - "nowait", &state.nowait, "details", &report_error, NULL); @@ -1126,20 +1117,20 @@ main (int argc, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, &state, state.nowait); + on_failure, &state); else if (should_hide_splash) ply_boot_client_tell_daemon_to_hide_splash (state.client, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, &state, state.nowait); + on_failure, &state); else if (should_quit) ply_boot_client_tell_daemon_to_quit (state.client, false, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, &state, state.nowait); + on_failure, &state); else if (should_ping) ply_boot_client_ping_daemon (state.client, (ply_boot_client_response_handler_t) @@ -1151,13 +1142,13 @@ main (int argc, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, &state, state.nowait); + on_failure, &state); else if (status != NULL) ply_boot_client_update_daemon (state.client, status, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, &state, state.nowait); + on_failure, &state); else if (should_ask_for_password) { password_answer_state_t answer_state = { 0 }; @@ -1178,20 +1169,20 @@ main (int argc, (ply_boot_client_answer_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, &state, state.nowait); + on_failure, &state); } else if (should_sysinit) ply_boot_client_tell_daemon_system_is_initialized (state.client, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, &state, state.nowait); + on_failure, &state); else if (chroot_dir) ply_boot_client_tell_daemon_to_change_root (state.client, chroot_dir, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, &state, state.nowait); + on_failure, &state); else if (should_wait) {} // Do nothing @@ -1200,7 +1191,7 @@ main (int argc, (ply_boot_client_response_handler_t) on_success, (ply_boot_client_response_handler_t) - on_failure, &state, state.nowait); + on_failure, &state); exit_code = ply_event_loop_run (state.loop);