[Bf-blender-cvs] [dd8469608bc] master: Cleanup: unused return arg

[Campbell Barton]

Commit: dd8469608bc80369929cc7ddb95b553ecbe20e88
Author: Campbell Barton
Date:   Fri Nov 30 13:21:12 2018 +1100
Branches: master
https://developer.blender.org/rBdd8469608bc80369929cc7ddb95b553ecbe20e88

Cleanup: unused return arg

===================================================================

M	source/blender/windowmanager/intern/wm_files.c
M	source/blender/windowmanager/wm_files.h

===================================================================

diff --git a/source/blender/windowmanager/intern/wm_files.c b/source/blender/windowmanager/intern/wm_files.c
index acb954a4b05..effd1c89077 100644
--- a/source/blender/windowmanager/intern/wm_files.c
+++ b/source/blender/windowmanager/intern/wm_files.c
@@ -685,7 +685,7 @@ const char *WM_init_state_app_template_get(void)
  * \param app_template_override: Template to use instead of the template defined in user-preferences.
  * When not-null, this is written into the user preferences.
  */
-int wm_homefile_read(
+void wm_homefile_read(
         bContext *C, ReportList *reports,
         bool use_factory_settings, bool use_empty_data, bool use_userdef,
         const char *filepath_startup_override, const char *app_template_override)
@@ -921,8 +921,6 @@ int wm_homefile_read(
 	G.fileflags &= ~G_FILE_AUTOPLAY;
 
 	wm_file_read_post(C, true, use_userdef);
-
-	return true;
 }
 
 /** \name WM History File API
@@ -1672,15 +1670,11 @@ static int wm_homefile_read_exec(bContext *C, wmOperator *op)
 		app_template = WM_init_state_app_template_get();
 	}
 
-	if (wm_homefile_read(C, op->reports, use_factory_settings, use_empty_data, use_userdef, filepath, app_template)) {
-		if (use_splash) {
-			WM_init_splash(C);
-		}
-		return OPERATOR_FINISHED;
-	}
-	else {
-		return OPERATOR_CANCELLED;
+	wm_homefile_read(C, op->reports, use_factory_settings, use_empty_data, use_userdef, filepath, app_template);
+	if (use_splash) {
+		WM_init_splash(C);
 	}
+	return OPERATOR_FINISHED;
 }
 
 void WM_OT_read_homefile(wmOperatorType *ot)
diff --git a/source/blender/windowmanager/wm_files.h b/source/blender/windowmanager/wm_files.h
index 147ed882966..465abf011fa 100644
--- a/source/blender/windowmanager/wm_files.h
+++ b/source/blender/windowmanager/wm_files.h
@@ -35,8 +35,8 @@ struct Main;
 struct wmOperatorType;
 
 /* wm_files.c */
-void		wm_history_file_read(void);
-int			wm_homefile_read(
+void wm_history_file_read(void);
+void wm_homefile_read(
         struct bContext *C, struct ReportList *reports,
         bool use_factory_settings, bool use_empty_data, bool use_userdef,
         const char *filepath_startup_override, const char *app_template_override);