mirror of
https://github.com/irssi/irssi.git
synced 2024-09-01 04:14:16 -04:00
Add macros to check for correct signal_emit params
This allows the compiler to throw an error if the params argument doesn't match the number of params provided after.
This commit is contained in:
parent
f5e587a83b
commit
e38774cc65
@ -270,7 +270,7 @@ static int signal_emit_real(Signal *rec, int params, va_list va,
|
|||||||
return stopped;
|
return stopped;
|
||||||
}
|
}
|
||||||
|
|
||||||
int signal_emit(const char *signal, int params, ...)
|
int signal_emit_func(const char *signal, int params, ...)
|
||||||
{
|
{
|
||||||
Signal *rec;
|
Signal *rec;
|
||||||
va_list va;
|
va_list va;
|
||||||
@ -290,7 +290,7 @@ int signal_emit(const char *signal, int params, ...)
|
|||||||
return rec != NULL;
|
return rec != NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
int signal_emit_id(int signal_id, int params, ...)
|
int signal_emit_id_func(int signal_id, int params, ...)
|
||||||
{
|
{
|
||||||
Signal *rec;
|
Signal *rec;
|
||||||
va_list va;
|
va_list va;
|
||||||
|
@ -40,8 +40,25 @@ void signal_remove_full(const char *signal, SIGNAL_FUNC func, void *user_data);
|
|||||||
void signal_remove_id(int signal_id, SIGNAL_FUNC func, void *user_data);
|
void signal_remove_id(int signal_id, SIGNAL_FUNC func, void *user_data);
|
||||||
|
|
||||||
/* emit signal */
|
/* emit signal */
|
||||||
int signal_emit(const char *signal, int params, ...);
|
/* macros to check for proper argument count */
|
||||||
int signal_emit_id(int signal_id, int params, ...);
|
#define signal_emit(signal, params, ...) signal_emit_##params(signal, ##__VA_ARGS__)
|
||||||
|
#define signal_emit_0(signal) signal_emit_func(signal, 0)
|
||||||
|
#define signal_emit_1(signal, arg1) signal_emit_func(signal, 1, arg1)
|
||||||
|
#define signal_emit_2(signal, arg1, arg2) signal_emit_func(signal, 2, arg1, arg2)
|
||||||
|
#define signal_emit_3(signal, arg1, arg2, arg3) signal_emit_func(signal, 3, arg1, arg2, arg3)
|
||||||
|
#define signal_emit_4(signal, arg1, arg2, arg3, arg4) signal_emit_func(signal, 4, arg1, arg2, arg3, arg4)
|
||||||
|
#define signal_emit_5(signal, arg1, arg2, arg3, arg4, arg5) signal_emit_func(signal, 5, arg1, arg2, arg3, arg4, arg5)
|
||||||
|
#define signal_emit_6(signal, arg1, arg2, arg3, arg4, arg5, arg6) signal_emit_func(signal, 6, arg1, arg2, arg3, arg4, arg5, arg6)
|
||||||
|
#define signal_emit_id(signal, params, ...) signal_emit_id_##params(signal, ##__VA_ARGS__)
|
||||||
|
#define signal_emit_id_0(signal) signal_emit_id_func(signal, 0)
|
||||||
|
#define signal_emit_id_1(signal, arg1) signal_emit_id_func(signal, 1, arg1)
|
||||||
|
#define signal_emit_id_2(signal, arg1, arg2) signal_emit_id_func(signal, 2, arg1, arg2)
|
||||||
|
#define signal_emit_id_3(signal, arg1, arg2, arg3) signal_emit_id_func(signal, 3, arg1, arg2, arg3)
|
||||||
|
#define signal_emit_id_4(signal, arg1, arg2, arg3, arg4) signal_emit_id_func(signal, 4, arg1, arg2, arg3, arg4)
|
||||||
|
#define signal_emit_id_5(signal, arg1, arg2, arg3, arg4, arg5) signal_emit_id_func(signal, 5, arg1, arg2, arg3, arg4, arg5)
|
||||||
|
#define signal_emit_id_6(signal, arg1, arg2, arg3, arg4, arg5, arg6) signal_emit_id_func(signal, 6, arg1, arg2, arg3, arg4, arg5, arg6)
|
||||||
|
int signal_emit_func(const char *signal, int params, ...);
|
||||||
|
int signal_emit_id_func(int signal_id, int params, ...);
|
||||||
|
|
||||||
/* continue currently emitted signal with different parameters */
|
/* continue currently emitted signal with different parameters */
|
||||||
void signal_continue(int params, ...);
|
void signal_continue(int params, ...);
|
||||||
|
Loading…
Reference in New Issue
Block a user