Code cleanup: add BLI_testextensie_n, replacing multuple calls to BLI_testextensie

also use attributes for BLI path functions

2 files changed, 8 insertions, 8 deletions

diff --git a/source/blender/blenloader/BLO_readfile.h b/source/blender/blenloader/BLO_readfile.h
index 58d0cf6d264..b39f247ccd3 100644
--- a/source/blender/blenloader/BLO_readfile.h
+++ b/source/blender/blenloader/BLO_readfile.h
@@ -194,12 +194,13 @@ BLO_blendhandle_close(BlendHandle *bh);
 
 #define GROUP_MAX 32
 
-int BLO_has_bfile_extension(const char *str);
+bool BLO_has_bfile_extension(const char *str);
 
-/* return ok when a blenderfile, in dir is the filename,
+/**
+ * return ok when a blenderfile, in dir is the filename,
  * in group the type of libdata
  */
-int BLO_is_a_library(const char *path, char *dir, char *group);
+bool BLO_is_a_library(const char *path, char *dir, char *group);
 
 
 /**
diff --git a/source/blender/blenloader/intern/readfile.c b/source/blender/blenloader/intern/readfile.c
index 29de575e8b8..2a1ca226d31 100644
--- a/source/blender/blenloader/intern/readfile.c
+++ b/source/blender/blenloader/intern/readfile.c
@@ -1151,14 +1151,13 @@ void blo_freefiledata(FileData *fd)
 
 /* ************ DIV ****************** */
 
-int BLO_has_bfile_extension(const char *str)
+bool BLO_has_bfile_extension(const char *str)
 {
-	return (BLI_testextensie(str, ".ble") || 
-	        BLI_testextensie(str, ".blend") || 
-	        BLI_testextensie(str, ".blend.gz"));
+	const char *ext_test[4] = {".blend", ".ble", ".blend.gz", NULL};
+	return BLI_testextensie_array(str, ext_test);
 }
 
-int BLO_is_a_library(const char *path, char *dir, char *group)
+bool BLO_is_a_library(const char *path, char *dir, char *group)
 {
 	/* return ok when a blenderfile, in dir is the filename,
 	 * in group the type of libdata