diff options
| author | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-03 14:27:40 +0300 |
|---|---|---|
| committer | Bastien Montagne <montagne29@wanadoo.fr> | 2015-01-03 14:41:36 +0300 |
| commit | b137f06d7ecc7beae3b9fbeba0a71b324198c7e2 (patch) | |
| tree | efef56b487ec1907a145bc0b130072fcced4b856 /source/blender/editors | |
| parent | 780bb88a7a5b30eaf8a62b999a30ac7bb4153ebf (diff) | |
Cleanup: rename 'filelist' BLI funcs to consistent naming.
Also, add an optional callback to `BLI_filelist_free()` to allow freein
void poin if needed (consistency with `BLI_filelist_duplicate()`...).
Diffstat (limited to 'source/blender/editors')
| -rw-r--r-- | source/blender/editors/interface/interface_icons.c | 4 | ||||
| -rw-r--r-- | source/blender/editors/interface/interface_templates.c | 2 | ||||
| -rw-r--r-- | source/blender/editors/space_file/filelist.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/source/blender/editors/interface/interface_icons.c b/source/blender/editors/interface/interface_icons.c index a54ced53e5e..cb5a26b1be3 100644 --- a/source/blender/editors/interface/interface_icons.c +++ b/source/blender/editors/interface/interface_icons.c @@ -708,7 +708,7 @@ static void init_iconfile_list(struct ListBase *list) if (icondir == NULL) return; - totfile = BLI_dir_contents(icondir, &dir); + totfile = BLI_filelist_dir_contents(icondir, &dir); for (i = 0; i < totfile; i++) { if ((dir[i].type & S_IFREG)) { @@ -756,7 +756,7 @@ static void init_iconfile_list(struct ListBase *list) } } - BLI_free_filelist(dir, totfile); + BLI_filelist_free(dir, totfile, NULL); dir = NULL; } diff --git a/source/blender/editors/interface/interface_templates.c b/source/blender/editors/interface/interface_templates.c index e3fa591a60f..407843d663c 100644 --- a/source/blender/editors/interface/interface_templates.c +++ b/source/blender/editors/interface/interface_templates.c @@ -2672,7 +2672,7 @@ static void uilist_filter_items_default(struct uiList *ui_list, struct bContext names = MEM_callocN(sizeof(StringCmp) * len, "StringCmp"); } if (filter_raw[0]) { - size_t idx = 0, slen = strlen(filter_raw); + size_t slen = strlen(filter_raw); dyn_data->items_filter_flags = MEM_callocN(sizeof(int) * len, "items_filter_flags"); dyn_data->items_shown = 0; diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c index f8248d9bcb5..abfa1ed5666 100644 --- a/source/blender/editors/space_file/filelist.c +++ b/source/blender/editors/space_file/filelist.c @@ -736,7 +736,7 @@ void filelist_free(struct FileList *filelist) filelist->need_sorting = false; filelist->sort = FILE_SORT_NONE; - BLI_free_filelist(filelist->filelist, filelist->numfiles); + BLI_filelist_free(filelist->filelist, filelist->numfiles, NULL); filelist->numfiles = 0; filelist->filelist = NULL; } @@ -953,7 +953,7 @@ static void filelist_read_dir(struct FileList *filelist) filelist->filelist = NULL; BLI_cleanup_dir(G.main->name, filelist->dir); - filelist->numfiles = BLI_dir_contents(filelist->dir, &(filelist->filelist)); + filelist->numfiles = BLI_filelist_dir_contents(filelist->dir, &(filelist->filelist)); filelist_setfiletypes(filelist); } |