diff options
author | Monty <monty@mariadb.org> | 2015-11-20 10:00:06 +0200 |
---|---|---|
committer | Monty <monty@mariadb.org> | 2015-11-20 10:00:06 +0200 |
commit | 1e156e1436f931625b7a5573584a786388979de2 (patch) | |
tree | 639e38f63dced79371e7946f46a36d6e1dc25e70 /plugin/example_key_management | |
parent | 981b4747538c742932561d278919fc4b57bd37eb (diff) | |
download | mariadb-git-1e156e1436f931625b7a5573584a786388979de2.tar.gz |
Fixed compile warnings on Solaris
Diffstat (limited to 'plugin/example_key_management')
-rw-r--r-- | plugin/example_key_management/example_key_management_plugin.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/plugin/example_key_management/example_key_management_plugin.cc b/plugin/example_key_management/example_key_management_plugin.cc index fb19710c0ef..2b417866406 100644 --- a/plugin/example_key_management/example_key_management_plugin.cc +++ b/plugin/example_key_management/example_key_management_plugin.cc @@ -36,24 +36,25 @@ #define KEY_ROTATION_MAX 90 static struct my_rnd_struct seed; -static unsigned int key_version = 0; -static unsigned int next_key_version = 0; +static time_t key_version = 0; +static time_t next_key_version = 0; static pthread_mutex_t mutex; static unsigned int get_latest_key_version(unsigned int key_id) { - uint now = time(0); + time_t now = time(0); pthread_mutex_lock(&mutex); if (now >= next_key_version) { key_version = now; unsigned int interval = KEY_ROTATION_MAX - KEY_ROTATION_MIN; - next_key_version = now + KEY_ROTATION_MIN + my_rnd(&seed) * interval; + next_key_version = (time_t) (now + KEY_ROTATION_MIN + + my_rnd(&seed) * interval); } pthread_mutex_unlock(&mutex); - return key_version; + return (unsigned int) key_version; } static unsigned int |