fix for use of un-initialized pointers in file_sfile_to_operator(...) & remove unused vars.

3 files changed, 12 insertions, 10 deletions

diff --git a/source/blender/editors/space_file/file_ops.c b/source/blender/editors/space_file/file_ops.c
index 9005a6c1796..7f8fe3eb4d8 100644
--- a/source/blender/editors/space_file/file_ops.c
+++ b/source/blender/editors/space_file/file_ops.c
@@ -146,7 +146,7 @@ static FileSelection file_selection_get(bContext* C, const rcti* rect, short fil
 	if (fill && (sel.last >= 0) && (sel.last < numfiles) ) {
 		int f= sel.last;
 		while (f >= 0) {
-			if ( filelist_is_selected(sfile->files, f, SELECTED_FILE, CHECK_ALL) )
+			if ( filelist_is_selected(sfile->files, f, CHECK_ALL) )
 				break;
 			f--;
 		}
@@ -216,7 +216,7 @@ static FileSelect file_select(bContext* C, const rcti* rect, FileSelType select,
 	if ( (sel.last >= 0) && ((select == FILE_SEL_ADD) || (select == FILE_SEL_TOGGLE)) )
 	{
 		/* Check last selection, if selected, act on the file or dir */
-		if (filelist_is_selected(sfile->files, sel.last, SELECTED_FILE, CHECK_ALL)) {
+		if (filelist_is_selected(sfile->files, sel.last, CHECK_ALL)) {
 			retval = file_select_do(C, sel.last);
 		}
 	}
@@ -369,7 +369,7 @@ static int file_select_all_exec(bContext *C, wmOperator *UNUSED(op))
 
 	/* Is any file selected ? */
 	for ( i=0; i < numfiles; ++i) {
-		if (filelist_is_selected(sfile->files, i, SELECTED_FILE, CHECK_ALL)) {
+		if (filelist_is_selected(sfile->files, i, CHECK_ALL)) {
 			is_selected = 1;
 			break;
 		}
@@ -619,10 +619,11 @@ void file_sfile_to_operator(wmOperator *op, SpaceFile *sfile, char *filepath)
 	{
 		PointerRNA itemptr;
 		int i, numfiles = filelist_numfiles(sfile->files);
-		struct direntry *file;
+
 		if(RNA_struct_find_property(op->ptr, "files")) {
 			for (i=0; i<numfiles; i++) {
-				if (filelist_is_selected(sfile->files, i, SELECTED_FILE, CHECK_FILES)) {
+				if (filelist_is_selected(sfile->files, i, CHECK_FILES)) {
+					struct direntry *file= filelist_file(sfile->files, i);
 					RNA_collection_add(op->ptr, "files", &itemptr);
 					RNA_string_set(&itemptr, "name", file->relname);
 				}
@@ -631,7 +632,8 @@ void file_sfile_to_operator(wmOperator *op, SpaceFile *sfile, char *filepath)
 		
 		if(RNA_struct_find_property(op->ptr, "dirs")) {
 			for (i=0; i<numfiles; i++) {
-				if (filelist_is_selected(sfile->files, i, SELECTED_FILE, CHECK_DIRS)) {
+				if (filelist_is_selected(sfile->files, i, CHECK_DIRS)) {
+					struct direntry *file= filelist_file(sfile->files, i);
 					RNA_collection_add(op->ptr, "dirs", &itemptr);
 					RNA_string_set(&itemptr, "name", file->relname);
 				}
@@ -718,7 +720,7 @@ int file_exec(bContext *C, wmOperator *exec_op)
 			int i, active=0;
 			
 			for (i=0; i<filelist_numfiles(sfile->files); i++) {
-				if(filelist_is_selected(sfile->files, i, SELECTED_FILE, CHECK_ALL)) {
+				if(filelist_is_selected(sfile->files, i, CHECK_ALL)) {
 					active=1;
 					break;
 				}
@@ -883,7 +885,7 @@ static int file_smoothscroll_invoke(bContext *C, wmOperator *UNUSED(op), wmEvent
 	/* check if we are editing a name */
 	for (i=0; i < numfiles; ++i)
 	{
-		if (filelist_is_selected(sfile->files, i, EDITING_FILE, CHECK_ALL) ) {
+		if (filelist_is_selected(sfile->files, i, CHECK_ALL) ) {
 			edit_idx=i;
 			break;
 		}
diff --git a/source/blender/editors/space_file/filelist.c b/source/blender/editors/space_file/filelist.c
index 1292cc68f65..da8226de516 100644
--- a/source/blender/editors/space_file/filelist.c
+++ b/source/blender/editors/space_file/filelist.c
@@ -948,7 +948,7 @@ void filelist_select(struct FileList* filelist, FileSelection* sel, FileSelType
 	}
 }
 
-int	filelist_is_selected(struct FileList* filelist, int index, unsigned int flag, FileCheckType check)
+int	filelist_is_selected(struct FileList* filelist, int index, FileCheckType check)
 {
 	struct direntry* file = filelist_file(filelist, index);
 	if (!file) {
diff --git a/source/blender/editors/space_file/filelist.h b/source/blender/editors/space_file/filelist.h
index c63e7f0b1ce..c5535b22f22 100644
--- a/source/blender/editors/space_file/filelist.h
+++ b/source/blender/editors/space_file/filelist.h
@@ -77,7 +77,7 @@ void				filelist_setdir(struct FileList* filelist, const char *dir);
 struct direntry *	filelist_file(struct FileList* filelist, int index);
 void				filelist_select(struct FileList* filelist, FileSelection* sel, FileSelType select, unsigned int flag, FileCheckType check);
 void				filelist_select_file(struct FileList* filelist, int index, FileSelType select, unsigned int flag, FileCheckType check);
-int					filelist_is_selected(struct FileList* filelist, int index, unsigned int flag, FileCheckType check);
+int					filelist_is_selected(struct FileList* filelist, int index, FileCheckType check);
 void				filelist_hidedot(struct FileList* filelist, short hide);
 void				filelist_setfilter(struct FileList* filelist, unsigned int filter);
 void				filelist_setfilter_types(struct FileList* filelist, const char *filter_glob);