From f09771a1027852779eff49168c6711ebcd7d4a95 Mon Sep 17 00:00:00 2001 From: chaac Date: Sun, 28 May 2006 21:58:35 +0000 Subject: [PATCH] 2006-05-29 Vesa Jaaskelainen * include/grub/script.h (grub_script_cmdif): Renamed field 'bool' to 'exec_to_evaluate'. Renamed field 'true' to 'exec_on_true'. Renamed field 'false' to 'exec_on_false'. (grub_script_create_cmdif): Renamed argument names to reflect above changes. * normal/execute.c (grub_script_execute_cmdif): Likewise. * normal/script.c (grub_script_create_cmdif): Likewise. --- ChangeLog | 12 ++++++++++++ include/grub/script.h | 18 +++++++++--------- normal/execute.c | 16 ++++++++-------- normal/script.c | 14 +++++++------- 4 files changed, 36 insertions(+), 24 deletions(-) diff --git a/ChangeLog b/ChangeLog index d8e56e540..f6c20402b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2006-05-29 Vesa Jaaskelainen + + * include/grub/script.h (grub_script_cmdif): Renamed field 'bool' to + 'exec_to_evaluate'. Renamed field 'true' to 'exec_on_true'. Renamed + field 'false' to 'exec_on_false'. + (grub_script_create_cmdif): Renamed argument names to reflect above + changes. + + * normal/execute.c (grub_script_execute_cmdif): Likewise. + + * normal/script.c (grub_script_create_cmdif): Likewise. + 2006-05-28 Yoshinori K. Okuji * fs/hfsplus.c (grub_hfsplus_btree_recoffset): Moved to near the diff --git a/include/grub/script.h b/include/grub/script.h index 661d0ee33..f00fdcd3d 100644 --- a/include/grub/script.h +++ b/include/grub/script.h @@ -100,14 +100,14 @@ struct grub_script_cmdif { struct grub_script_cmd cmd; - /* The command used to check if the if is true or false. */ - struct grub_script_cmd *bool; + /* The command used to check if the 'if' is true or false. */ + struct grub_script_cmd *exec_to_evaluate; - /* The code executed in case the result if bool was true. */ - struct grub_script_cmd *true; + /* The code executed in case the result of 'if' was true. */ + struct grub_script_cmd *exec_on_true; - /* The code executed in case the result if bool was false. */ - struct grub_script_cmd *false; + /* The code executed in case the result of 'if' was false. */ + struct grub_script_cmd *exec_on_false; }; /* A menu entry generate statement. */ @@ -200,9 +200,9 @@ grub_script_create_cmdblock (struct grub_parser_param *state); struct grub_script_cmd * grub_script_create_cmdif (struct grub_parser_param *state, - struct grub_script_cmd *bool, - struct grub_script_cmd *true, - struct grub_script_cmd *false); + struct grub_script_cmd *exec_to_evaluate, + struct grub_script_cmd *exec_on_true, + struct grub_script_cmd *exec_on_false); struct grub_script_cmd * grub_script_create_cmdmenu (struct grub_parser_param *state, diff --git a/normal/execute.c b/normal/execute.c index 9f28bd3a6..bcb8a214b 100644 --- a/normal/execute.c +++ b/normal/execute.c @@ -192,19 +192,19 @@ grub_err_t grub_script_execute_cmdif (struct grub_script_cmd *cmd) { struct grub_script_cmdif *cmdif = (struct grub_script_cmdif *) cmd; - char *bool; + char *result; /* Check if the commands results in a true or a false. The value is - read from the env variable `RESULT'. */ - grub_script_execute_cmd (cmdif->bool); - bool = grub_env_get ("?"); + read from the env variable `?'. */ + grub_script_execute_cmd (cmdif->exec_to_evaluate); + result = grub_env_get ("?"); /* Execute the `if' or the `else' part depending on the value of - `RESULT'. */ - if (bool && ! grub_strcmp (bool, "0")) - return grub_script_execute_cmd (cmdif->true); + `?'. */ + if (result && ! grub_strcmp (result, "0")) + return grub_script_execute_cmd (cmdif->exec_on_true); else - return grub_script_execute_cmd (cmdif->false); + return grub_script_execute_cmd (cmdif->exec_on_false); } /* Execute the menu entry generate statement. */ diff --git a/normal/script.c b/normal/script.c index e4ce01dc8..033ab976b 100644 --- a/normal/script.c +++ b/normal/script.c @@ -178,14 +178,14 @@ grub_script_create_cmdline (struct grub_parser_param *state, } /* Create a command that functions as an if statement. If BOOL is - evaluated to true (the value is returned in envvar RESULT), the + evaluated to true (the value is returned in envvar '?'), the interpreter will run the command TRUE, otherwise the interpreter runs the command FALSE. */ struct grub_script_cmd * grub_script_create_cmdif (struct grub_parser_param *state, - struct grub_script_cmd *bool, - struct grub_script_cmd *true, - struct grub_script_cmd *false) + struct grub_script_cmd *exec_to_evaluate, + struct grub_script_cmd *exec_on_true, + struct grub_script_cmd *exec_on_false) { struct grub_script_cmdif *cmd; @@ -194,9 +194,9 @@ grub_script_create_cmdif (struct grub_parser_param *state, cmd = grub_script_malloc (state, sizeof (*cmd)); cmd->cmd.exec = grub_script_execute_cmdif; cmd->cmd.next = 0; - cmd->bool = bool; - cmd->true = true; - cmd->false = false; + cmd->exec_to_evaluate = exec_to_evaluate; + cmd->exec_on_true = exec_on_true; + cmd->exec_on_false = exec_on_false; return (struct grub_script_cmd *) cmd; }