From 0cdc74253828c30c48bba01696c381c1cd6d47cc Mon Sep 17 00:00:00 2001 From: Dom Postorivo Date: Sun, 3 Nov 2019 22:02:36 -0500 Subject: [PATCH] make ret variable more unique to prevent collision with with code under test --- lib/cmock_generator_plugin_callback.rb | 4 ++-- test/unit/cmock_generator_plugin_callback_test.rb | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/cmock_generator_plugin_callback.rb b/lib/cmock_generator_plugin_callback.rb index 564e0ac..76593f0 100644 --- a/lib/cmock_generator_plugin_callback.rb +++ b/lib/cmock_generator_plugin_callback.rb @@ -60,9 +60,9 @@ class CMockGeneratorPluginCallback " UNITY_CLR_DETAILS();\n" \ " return;\n }\n" else - " #{function[:return][:type]} ret = #{generate_call(function)};\n" \ + " #{function[:return][:type]} cmock_cb_ret = #{generate_call(function)};\n" \ " UNITY_CLR_DETAILS();\n" \ - " return ret;\n }\n" + " return cmock_cb_ret;\n }\n" end end diff --git a/test/unit/cmock_generator_plugin_callback_test.rb b/test/unit/cmock_generator_plugin_callback_test.rb index e2ea60b..a90e028 100644 --- a/test/unit/cmock_generator_plugin_callback_test.rb +++ b/test/unit/cmock_generator_plugin_callback_test.rb @@ -191,9 +191,9 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu expected = [" if (!Mock.Apple_CallbackBool &&\n", " Mock.Apple_CallbackFunctionPointer != NULL)\n", " {\n", - " int ret = Mock.Apple_CallbackFunctionPointer(Mock.Apple_CallbackCalls++);\n", + " int cmock_cb_ret = Mock.Apple_CallbackFunctionPointer(Mock.Apple_CallbackCalls++);\n", " UNITY_CLR_DETAILS();\n", - " return ret;\n", + " return cmock_cb_ret;\n", " }\n" ].join returned = @cmock_generator_plugin_callback.mock_implementation_precheck(function) @@ -246,9 +246,9 @@ describe CMockGeneratorPluginCallback, "Verify CMockGeneratorPluginCallback Modu expected = [" if (!Mock.Apple_CallbackBool &&\n", " Mock.Apple_CallbackFunctionPointer != NULL)\n", " {\n", - " int ret = Mock.Apple_CallbackFunctionPointer(steak, flag, Mock.Apple_CallbackCalls++);\n", + " int cmock_cb_ret = Mock.Apple_CallbackFunctionPointer(steak, flag, Mock.Apple_CallbackCalls++);\n", " UNITY_CLR_DETAILS();\n", - " return ret;\n", + " return cmock_cb_ret;\n", " }\n" ].join returned = @cmock_generator_plugin_callback.mock_implementation_precheck(function)