summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorDan Halbert <halbert@halwitz.org>2018-05-04 08:28:05 -0400
committerDan Halbert <halbert@halwitz.org>2018-05-04 08:28:05 -0400
commitf73e06d9108e4e5a0d5b8faed7d5c9819e1cc37d (patch)
treeb74ab88c95372da26643e7bfa7bf3508429d8a32 /main.c
parentf486ead84a44846996c66d117de391fab048b01b (diff)
minor function API improvement
Diffstat (limited to 'main.c')
-rw-r--r--main.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/main.c b/main.c
index 680a74dea..af847976c 100644
--- a/main.c
+++ b/main.c
@@ -102,24 +102,24 @@ void reset_mp(void) {
// Look for the first file that exists in the list of filenames, using mp_import_stat().
// Return its index. If no file found, return -1.
-int first_existing_file_in_list(const char ** filenames) {
+const char* first_existing_file_in_list(const char ** filenames) {
for (int i = 0; filenames[i] != (char*)""; i++) {
mp_import_stat_t stat = mp_import_stat(filenames[i]);
if (stat == MP_IMPORT_STAT_FILE) {
- return i;
+ return filenames[i];
}
}
- return -1;
+ return NULL;
}
bool maybe_run_list(const char ** filenames, pyexec_result_t* exec_result) {
- int i = first_existing_file_in_list(filenames);
- if (i == -1) {
+ const char* filename = first_existing_file_in_list(filenames);
+ if (filename == NULL) {
return false;
}
- mp_hal_stdout_tx_str(filenames[i]);
+ mp_hal_stdout_tx_str(filename);
mp_hal_stdout_tx_str(MSG_OUTPUT_SUFFIX);
- pyexec_file(filenames[i], exec_result);
+ pyexec_file(filename, exec_result);
return true;
}
@@ -281,7 +281,7 @@ int __attribute__((used)) main(void) {
// Get the base filesystem.
FATFS *fs = &((fs_user_mount_t *) MP_STATE_VM(vfs_mount_table)->obj)->fatfs;
- bool have_boot_py = first_existing_file_in_list(boot_py_filenames) != -1;
+ bool have_boot_py = first_existing_file_in_list(boot_py_filenames) != NULL;
bool skip_boot_output = false;