- added patch "remove error handler as planned"

[openocd.git] / src / helper / interpreter.c

diff --git a/src/helper/interpreter.c b/src/helper/interpreter.c
index 17d24b1fe8cd89199f51ad8d77c5b68db65f9216..e5ce0f00028cc4e0947fc45383a0c4ea51f4fed7 100644 (file)
--- a/src/helper/interpreter.c
+++ b/src/helper/interpreter.c
@@ -92,7 +92,7 @@ var_t* get_var_by_namenum(char *namenum)
        
 }
 
-int field_le_to_host(u8 *buffer, void *priv)
+int field_le_to_host(u8 *buffer, void *priv, struct scan_field_s *dummy)
 {
        var_field_t *field = priv;
        field->value = buf_get_u32(buffer, 0, field->num_bits);
@@ -126,7 +126,7 @@ int handle_var_command(struct command_context_s *cmd_ctx, char *cmd, char **args
                        last_var_p = &((*last_var_p)->next);
                }
 
-               if ((args[0][0] >= 0) && (args[0][0] <= 9))
+               if ((args[0][0] >= '0') && (args[0][0] <= '9'))
                {
                        command_print(cmd_ctx, "invalid name specified (first character may not be a number)");
                        return ERROR_OK;
@@ -231,7 +231,7 @@ int handle_script_command(struct command_context_s *cmd_ctx, char *cmd, char **a
        echo = cmd_ctx->echo;
        cmd_ctx->echo = 1;
        
-       command_run_file(cmd_ctx, script_file, COMMAND_EXEC);
+       command_run_file(cmd_ctx, script_file, cmd_ctx->mode);
        
        cmd_ctx->echo = echo;