Skip to content

Commit

Permalink
Build fix:
Browse files Browse the repository at this point in the history
declared deinit function of plugins as deinit(void) instead
of deinit().
  • Loading branch information
9EOR9 committed Oct 21, 2020
1 parent ca4f043 commit 1fed6c3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion include/mysql/client_plugin.h
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
const char *license; \
void *mysql_api; \
int (*init)(char *, size_t, int, va_list); \
int (*deinit)(); \
int (*deinit)(void); \
int (*options)(const char *option, const void *);
struct st_mysql_client_plugin
{
Expand Down
4 changes: 2 additions & 2 deletions plugins/auth/caching_sha2_pw.c
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ static int ma_sha256_scramble(unsigned char *scramble, size_t scramble_len,

/* function prototypes */
static int auth_caching_sha2_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
static int auth_caching_sha2_deinit();
static int auth_caching_sha2_deinit(void);
static int auth_caching_sha2_init(char *unused1,
size_t unused2,
int unused3,
Expand Down Expand Up @@ -450,7 +450,7 @@ static int auth_caching_sha2_init(char *unused1 __attribute__((unused)),
/* }}} */

/* {{{ auth_caching_sha2_deinit */
static int auth_caching_sha2_deinit()
static int auth_caching_sha2_deinit(void)
{
#if defined(HAVE_WINCRYPT)
BCryptCloseAlgorithmProvider(Sha256Prov, 0);
Expand Down
4 changes: 2 additions & 2 deletions plugins/auth/ed25519.c
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ extern BCRYPT_ALG_HANDLE Sha512Prov;

/* function prototypes */
static int auth_ed25519_client(MYSQL_PLUGIN_VIO *vio, MYSQL *mysql);
static int auth_ed25519_deinit();
static int auth_ed25519_deinit(void);
static int auth_ed25519_init(char *unused1,
size_t unused2,
int unused3,
Expand Down Expand Up @@ -132,7 +132,7 @@ static int auth_ed25519_init(char *unused1 __attribute__((unused)),
/* }}} */

/* {{{ auth_ed25519_deinit */
static int auth_ed25519_deinit()
static int auth_ed25519_deinit(void)
{
#if defined(HAVE_WINCRYPT)
BCryptCloseAlgorithmProvider(Sha512Prov, 0);
Expand Down
2 changes: 1 addition & 1 deletion plugins/trace/trace_example.c
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ static int trace_init(char *errormsg,
}
/* }}} */

static int trace_deinit()
static int trace_deinit(void)
{
/* unregister plugin */
while(trace_info)
Expand Down

0 comments on commit 1fed6c3

Please sign in to comment.