djsundog
/
circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor function API improvement

This commit is contained in:
Dan Halbert 2018-05-04 08:28:05 -04:00
parent f486ead84a
commit f73e06d910
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
main.c
View File

@ -102,24 +102,24 @@ void reset_mp(void) {
// Look for the first file that exists in the list of filenames, using mp_import_stat(). // 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. // 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++) { for (int i = 0; filenames[i] != (char*)""; i++) {
mp_import_stat_t stat = mp_import_stat(filenames[i]); mp_import_stat_t stat = mp_import_stat(filenames[i]);
if (stat == MP_IMPORT_STAT_FILE) { 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) { bool maybe_run_list(const char ** filenames, pyexec_result_t* exec_result) {
int i = first_existing_file_in_list(filenames); const char* filename = first_existing_file_in_list(filenames);
if (i == -1) { if (filename == NULL) {
return false; return false;
} }
mp_hal_stdout_tx_str(filenames[i]); mp_hal_stdout_tx_str(filename);
mp_hal_stdout_tx_str(MSG_OUTPUT_SUFFIX); mp_hal_stdout_tx_str(MSG_OUTPUT_SUFFIX);
pyexec_file(filenames[i], exec_result); pyexec_file(filename, exec_result);
return true; return true;
} }
@ -281,7 +281,7 @@ int __attribute__((used)) main(void) {
// Get the base filesystem. // Get the base filesystem.
FATFS *fs = &((fs_user_mount_t *) MP_STATE_VM(vfs_mount_table)->obj)->fatfs; 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; bool skip_boot_output = false;