use '_exec' suffix for operator execute callbacks, also picky change to sizeof() use in BLI_array.h

1 files changed, 5 insertions, 5 deletions

diff --git a/source/blender/quicktime/apple/quicktime_export.c b/source/blender/quicktime/apple/quicktime_export.c
index ce4f3063082..52ef21e4f39 100644
--- a/source/blender/quicktime/apple/quicktime_export.c
+++ b/source/blender/quicktime/apple/quicktime_export.c
@@ -768,7 +768,7 @@ int get_qtcodec_settings(RenderData *rd, ReportList *reports)
 	return err;
 }
 
-static int request_qtcodec_settings(bContext *C, wmOperator *op)
+static int request_qtcodec_settings_exec(bContext *C, wmOperator *op)
 {
 	OSErr err = noErr;
 	Scene *scene = CTX_data_scene(C);
@@ -893,11 +893,11 @@ static int ED_operator_setqtcodec(bContext *C)
 #if defined(__APPLE__) && defined(GHOST_COCOA)
 /* Need to set up a Cocoa NSAutoReleasePool to avoid memory leak
  * And it must be done in an objC file, so use a GHOST_SystemCocoa.mm function for that */
-extern int cocoa_request_qtcodec_settings(bContext *C, wmOperator *op);
+extern int cocoa_request_qtcodec_settings_exec(bContext *C, wmOperator *op);
 
 int fromcocoa_request_qtcodec_settings(bContext *C, wmOperator *op)
 {
-	return request_qtcodec_settings(C, op);
+	return request_qtcodec_settings_exec(C, op);
 }
 #endif
 
@@ -911,9 +911,9 @@ void SCENE_OT_render_data_set_quicktime_codec(wmOperatorType *ot)
 	
 	/* api callbacks */
 #if defined(__APPLE__) && defined(GHOST_COCOA)
-	ot->exec = cocoa_request_qtcodec_settings;
+	ot->exec = cocoa_request_qtcodec_settings_exec;
 #else
-	ot->exec = request_qtcodec_settings;
+	ot->exec = request_qtcodec_settings_exec;
 #endif
 	ot->poll = ED_operator_setqtcodec;