diff options
Diffstat (limited to 'tools/perf/builtin-script.c')
-rw-r--r-- | tools/perf/builtin-script.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c index 373ea151dc60..5b1543f42290 100644 --- a/tools/perf/builtin-script.c +++ b/tools/perf/builtin-script.c | |||
@@ -2951,10 +2951,8 @@ int find_scripts(char **scripts_array, char **scripts_path_array) | |||
2951 | DIR *scripts_dir, *lang_dir; | 2951 | DIR *scripts_dir, *lang_dir; |
2952 | struct perf_session *session; | 2952 | struct perf_session *session; |
2953 | struct perf_data data = { | 2953 | struct perf_data data = { |
2954 | .file = { | 2954 | .path = input_name, |
2955 | .path = input_name, | 2955 | .mode = PERF_DATA_MODE_READ, |
2956 | }, | ||
2957 | .mode = PERF_DATA_MODE_READ, | ||
2958 | }; | 2956 | }; |
2959 | char *temp; | 2957 | char *temp; |
2960 | int i = 0; | 2958 | int i = 0; |
@@ -3427,8 +3425,8 @@ int cmd_script(int argc, const char **argv) | |||
3427 | argc = parse_options_subcommand(argc, argv, options, script_subcommands, script_usage, | 3425 | argc = parse_options_subcommand(argc, argv, options, script_subcommands, script_usage, |
3428 | PARSE_OPT_STOP_AT_NON_OPTION); | 3426 | PARSE_OPT_STOP_AT_NON_OPTION); |
3429 | 3427 | ||
3430 | data.file.path = input_name; | 3428 | data.path = input_name; |
3431 | data.force = symbol_conf.force; | 3429 | data.force = symbol_conf.force; |
3432 | 3430 | ||
3433 | if (argc > 1 && !strncmp(argv[0], "rec", strlen("rec"))) { | 3431 | if (argc > 1 && !strncmp(argv[0], "rec", strlen("rec"))) { |
3434 | rec_script_path = get_script_path(argv[1], RECORD_SUFFIX); | 3432 | rec_script_path = get_script_path(argv[1], RECORD_SUFFIX); |
@@ -3654,7 +3652,7 @@ int cmd_script(int argc, const char **argv) | |||
3654 | goto out_delete; | 3652 | goto out_delete; |
3655 | } | 3653 | } |
3656 | 3654 | ||
3657 | input = open(data.file.path, O_RDONLY); /* input_name */ | 3655 | input = open(data.path, O_RDONLY); /* input_name */ |
3658 | if (input < 0) { | 3656 | if (input < 0) { |
3659 | err = -errno; | 3657 | err = -errno; |
3660 | perror("failed to open file"); | 3658 | perror("failed to open file"); |