Skip to content

Commit

Permalink
patch 9.0.1471: warnings for function declarations
Browse files Browse the repository at this point in the history
Problem:    Warnings for function declarations.
Solution:   Add argument types. (Michael Jarvis, closes #12277)
  • Loading branch information
mojotx authored and brammool committed Apr 19, 2023
1 parent 1be4b81 commit be9624e
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 22 deletions.
2 changes: 1 addition & 1 deletion src/crypt.c
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ typedef struct {
int whole_undofile; // whole undo file is encrypted

// Optional function pointer for a self-test.
int (* self_test_fn)();
int (* self_test_fn)(void);

// Function pointer for initializing encryption/decryption.
int (* init_fn)(cryptstate_T *state, char_u *key,
Expand Down
6 changes: 3 additions & 3 deletions src/os_macosx.m
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ - (void) sound:(NSSound *)sound didFinishPlaying:(BOOL)flag
@end

void
process_cfrunloop()
process_cfrunloop(void)
{
if (sounds_list != nil && [sounds_list count] > 0)
{
Expand Down Expand Up @@ -493,7 +493,7 @@ - (void) sound:(NSSound *)sound didFinishPlaying:(BOOL)flag
}

void
sound_mch_clear()
sound_mch_clear(void)
{
if (sounds_list != nil)
{
Expand All @@ -510,7 +510,7 @@ - (void) sound:(NSSound *)sound didFinishPlaying:(BOOL)flag
}

void
sound_mch_free()
sound_mch_free(void)
{
sound_mch_clear();
}
Expand Down
30 changes: 15 additions & 15 deletions src/os_unix.c
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ static void deathtrap SIGPROTOARG;

static void catch_int_signal(void);
static void set_signals(void);
static void catch_signals(void (*func_deadly)(), void (*func_other)());
static void catch_signals(void (*func_deadly)(int), void (*func_other)(int));
#ifdef HAVE_SIGPROCMASK
# define SIGSET_DECL(set) sigset_t set;
# define BLOCK_SIGNALS(set) block_signals(set)
Expand Down Expand Up @@ -668,9 +668,9 @@ mch_delay(long msec, int flags)
// a patch from Sun to fix this. Reported by Gunnar Pedersen.
select(0, NULL, NULL, NULL, &tv);
}
# endif // HAVE_SELECT
# endif // HAVE_NANOSLEEP
#endif // HAVE_USLEEP
# endif
# endif
#endif
#ifdef FEAT_MZSCHEME
}
while (total > 0);
Expand Down Expand Up @@ -812,7 +812,7 @@ static struct sigstack sigstk; // for sigstack()
* Get a size of signal stack.
* Preference (if available): sysconf > SIGSTKSZ > guessed size
*/
static long int get_signal_stack_size()
static long int get_signal_stack_size(void)
{
# ifdef HAVE_SYSCONF_SIGSTKSZ
long int size = -1;
Expand Down Expand Up @@ -869,7 +869,7 @@ init_signal_stack(void)
sig_winch SIGDEFARG(sigarg)
{
// this is not required on all systems, but it doesn't hurt anybody
signal(SIGWINCH, (void (*)())sig_winch);
signal(SIGWINCH, (void (*)(int))sig_winch);
do_resize = TRUE;
}
#endif
Expand All @@ -890,7 +890,7 @@ sig_tstp SIGDEFARG(sigarg)
#if !defined(__ANDROID__) && !defined(__OpenBSD__) && !defined(__DragonFly__)
// This is not required on all systems. On some systems (at least Android,
// OpenBSD, and DragonFlyBSD) this breaks suspending with CTRL-Z.
signal(SIGTSTP, (void (*)())sig_tstp);
signal(SIGTSTP, (void (*)(int))sig_tstp);
#endif
}
#endif
Expand All @@ -900,7 +900,7 @@ sig_tstp SIGDEFARG(sigarg)
catch_sigint SIGDEFARG(sigarg)
{
// this is not required on all systems, but it doesn't hurt anybody
signal(SIGINT, (void (*)())catch_sigint);
signal(SIGINT, (void (*)(int))catch_sigint);
got_int = TRUE;
}
#endif
Expand All @@ -910,7 +910,7 @@ catch_sigint SIGDEFARG(sigarg)
catch_sigusr1 SIGDEFARG(sigarg)
{
// this is not required on all systems, but it doesn't hurt anybody
signal(SIGUSR1, (void (*)())catch_sigusr1);
signal(SIGUSR1, (void (*)(int))catch_sigusr1);
got_sigusr1 = TRUE;
}
#endif
Expand Down Expand Up @@ -1383,7 +1383,7 @@ set_signals(void)
/*
* WINDOW CHANGE signal is handled with sig_winch().
*/
signal(SIGWINCH, (void (*)())sig_winch);
signal(SIGWINCH, (void (*)(int))sig_winch);
#endif

#ifdef SIGTSTP
Expand All @@ -1395,7 +1395,7 @@ set_signals(void)
# ifdef FEAT_GUI
: gui.in_use || gui.starting ? SIG_DFL
# endif
: (void (*)())sig_tstp);
: (void (*)(int))sig_tstp);
#endif
#if defined(SIGCONT)
signal(SIGCONT, sigcont_handler);
Expand All @@ -1415,7 +1415,7 @@ set_signals(void)
/*
* Call user's handler on SIGUSR1
*/
signal(SIGUSR1, (void (*)())catch_sigusr1);
signal(SIGUSR1, (void (*)(int))catch_sigusr1);
#endif

/*
Expand Down Expand Up @@ -1454,7 +1454,7 @@ set_signals(void)
static void
catch_int_signal(void)
{
signal(SIGINT, (void (*)())catch_sigint);
signal(SIGINT, (void (*)(int))catch_sigint);
}
#endif

Expand All @@ -1470,8 +1470,8 @@ reset_signals(void)

static void
catch_signals(
void (*func_deadly)(),
void (*func_other)())
void (*func_deadly)(int),
void (*func_other)(int))
{
int i;

Expand Down
6 changes: 3 additions & 3 deletions src/proto/os_macosx.pro
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/* os_macosx.m */
void process_cfrunloop();
void process_cfrunloop(void);
bool sound_mch_play(const char_u* event, long sound_id, soundcb_T *callback, bool playfile);
void sound_mch_stop(long sound_id);
void sound_mch_clear();
void sound_mch_free();
void sound_mch_clear(void);
void sound_mch_free(void);
/* vim: set ft=c : */
2 changes: 2 additions & 0 deletions src/version.c
Original file line number Diff line number Diff line change
Expand Up @@ -695,6 +695,8 @@ static char *(features[]) =

static int included_patches[] =
{ /* Add new patch number below this line */
/**/
1471,
/**/
1470,
/**/
Expand Down

0 comments on commit be9624e

Please sign in to comment.