From 7888b6e9c821363a4da358a464411ba8bd4ceab2 Mon Sep 17 00:00:00 2001 From: usr42 Date: Thu, 26 Jan 2017 17:35:11 +0100 Subject: [PATCH] Use void as parameter when no parameter exists --- fakegen.rb | 1 + fff.h | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/fakegen.rb b/fakegen.rb index 2b1f842..5543d54 100644 --- a/fakegen.rb +++ b/fakegen.rb @@ -271,6 +271,7 @@ end #example: ARG0_TYPE arg0, ARG1_TYPE arg1 def arg_val_list(args_count) + return "void" if (args_count == 0) arguments = [] args_count.times { |i| arguments << "ARG#{i}_TYPE arg#{i}" } arguments.join(", ") diff --git a/fff.h b/fff.h index 85db589..f0d1bc7 100644 --- a/fff.h +++ b/fff.h @@ -133,8 +133,8 @@ FFF_END_EXTERN_C \ typedef struct FUNCNAME##_Fake { \ DECLARE_ALL_FUNC_COMMON \ DECLARE_CUSTOM_FAKE_SEQ_VARIABLES \ - void(*custom_fake)(); \ - void(**custom_fake_seq)(); \ + void(*custom_fake)(void); \ + void(**custom_fake_seq)(void); \ } FUNCNAME##_Fake;\ extern FUNCNAME##_Fake FUNCNAME##_fake;\ void FUNCNAME##_reset(); \ @@ -143,7 +143,7 @@ FFF_END_EXTERN_C \ #define DEFINE_FAKE_VOID_FUNC0(FUNCNAME) \ FFF_EXTERN_C \ FUNCNAME##_Fake FUNCNAME##_fake;\ - void FUNCNAME(){ \ + void FUNCNAME(void){ \ if(ROOM_FOR_MORE_HISTORY(FUNCNAME)){\ }\ else{\ @@ -1625,8 +1625,8 @@ FFF_END_EXTERN_C \ DECLARE_ALL_FUNC_COMMON \ DECLARE_VALUE_FUNCTION_VARIABLES(RETURN_TYPE) \ DECLARE_CUSTOM_FAKE_SEQ_VARIABLES \ - RETURN_TYPE(*custom_fake)(); \ - RETURN_TYPE(**custom_fake_seq)(); \ + RETURN_TYPE(*custom_fake)(void); \ + RETURN_TYPE(**custom_fake_seq)(void); \ } FUNCNAME##_Fake;\ extern FUNCNAME##_Fake FUNCNAME##_fake;\ void FUNCNAME##_reset(); \ @@ -1635,7 +1635,7 @@ FFF_END_EXTERN_C \ #define DEFINE_FAKE_VALUE_FUNC0(RETURN_TYPE, FUNCNAME) \ FFF_EXTERN_C \ FUNCNAME##_Fake FUNCNAME##_fake;\ - RETURN_TYPE FUNCNAME(){ \ + RETURN_TYPE FUNCNAME(void){ \ if(ROOM_FOR_MORE_HISTORY(FUNCNAME)){\ }\ else{\