1
0
mirror of https://github.com/meekrosoft/fff synced 2026-01-23 00:15:59 +01:00

Use void as parameter when no parameter exists

This commit is contained in:
usr42
2017-01-26 17:35:11 +01:00
parent 4e7451acd1
commit 7888b6e9c8
2 changed files with 7 additions and 6 deletions

View File

@@ -271,6 +271,7 @@ end
#example: ARG0_TYPE arg0, ARG1_TYPE arg1 #example: ARG0_TYPE arg0, ARG1_TYPE arg1
def arg_val_list(args_count) def arg_val_list(args_count)
return "void" if (args_count == 0)
arguments = [] arguments = []
args_count.times { |i| arguments << "ARG#{i}_TYPE arg#{i}" } args_count.times { |i| arguments << "ARG#{i}_TYPE arg#{i}" }
arguments.join(", ") arguments.join(", ")

12
fff.h
View File

@@ -133,8 +133,8 @@ FFF_END_EXTERN_C \
typedef struct FUNCNAME##_Fake { \ typedef struct FUNCNAME##_Fake { \
DECLARE_ALL_FUNC_COMMON \ DECLARE_ALL_FUNC_COMMON \
DECLARE_CUSTOM_FAKE_SEQ_VARIABLES \ DECLARE_CUSTOM_FAKE_SEQ_VARIABLES \
void(*custom_fake)(); \ void(*custom_fake)(void); \
void(**custom_fake_seq)(); \ void(**custom_fake_seq)(void); \
} FUNCNAME##_Fake;\ } FUNCNAME##_Fake;\
extern FUNCNAME##_Fake FUNCNAME##_fake;\ extern FUNCNAME##_Fake FUNCNAME##_fake;\
void FUNCNAME##_reset(); \ void FUNCNAME##_reset(); \
@@ -143,7 +143,7 @@ FFF_END_EXTERN_C \
#define DEFINE_FAKE_VOID_FUNC0(FUNCNAME) \ #define DEFINE_FAKE_VOID_FUNC0(FUNCNAME) \
FFF_EXTERN_C \ FFF_EXTERN_C \
FUNCNAME##_Fake FUNCNAME##_fake;\ FUNCNAME##_Fake FUNCNAME##_fake;\
void FUNCNAME(){ \ void FUNCNAME(void){ \
if(ROOM_FOR_MORE_HISTORY(FUNCNAME)){\ if(ROOM_FOR_MORE_HISTORY(FUNCNAME)){\
}\ }\
else{\ else{\
@@ -1625,8 +1625,8 @@ FFF_END_EXTERN_C \
DECLARE_ALL_FUNC_COMMON \ DECLARE_ALL_FUNC_COMMON \
DECLARE_VALUE_FUNCTION_VARIABLES(RETURN_TYPE) \ DECLARE_VALUE_FUNCTION_VARIABLES(RETURN_TYPE) \
DECLARE_CUSTOM_FAKE_SEQ_VARIABLES \ DECLARE_CUSTOM_FAKE_SEQ_VARIABLES \
RETURN_TYPE(*custom_fake)(); \ RETURN_TYPE(*custom_fake)(void); \
RETURN_TYPE(**custom_fake_seq)(); \ RETURN_TYPE(**custom_fake_seq)(void); \
} FUNCNAME##_Fake;\ } FUNCNAME##_Fake;\
extern FUNCNAME##_Fake FUNCNAME##_fake;\ extern FUNCNAME##_Fake FUNCNAME##_fake;\
void FUNCNAME##_reset(); \ void FUNCNAME##_reset(); \
@@ -1635,7 +1635,7 @@ FFF_END_EXTERN_C \
#define DEFINE_FAKE_VALUE_FUNC0(RETURN_TYPE, FUNCNAME) \ #define DEFINE_FAKE_VALUE_FUNC0(RETURN_TYPE, FUNCNAME) \
FFF_EXTERN_C \ FFF_EXTERN_C \
FUNCNAME##_Fake FUNCNAME##_fake;\ FUNCNAME##_Fake FUNCNAME##_fake;\
RETURN_TYPE FUNCNAME(){ \ RETURN_TYPE FUNCNAME(void){ \
if(ROOM_FOR_MORE_HISTORY(FUNCNAME)){\ if(ROOM_FOR_MORE_HISTORY(FUNCNAME)){\
}\ }\
else{\ else{\