]> git.ipfire.org Git - thirdparty/dovecot/core.git/commitdiff
stats: Compiler warning fixes.
authorTimo Sirainen <tss@iki.fi>
Mon, 26 Sep 2011 21:44:03 +0000 (00:44 +0300)
committerTimo Sirainen <tss@iki.fi>
Mon, 26 Sep 2011 21:44:03 +0000 (00:44 +0300)
src/stats/mail-command.c
src/stats/mail-domain.c
src/stats/mail-ip.c
src/stats/mail-session.c
src/stats/mail-user.c

index 440b50586ce741d112cf73c39939af313e901dfc..ead8b90ea02e08233d91707948fa3e16aec3665e 100644 (file)
@@ -153,6 +153,8 @@ int mail_command_update_parse(const char *const *args, const char **error_r)
 
 void mail_commands_free_memory(void)
 {
+       unsigned int diff;
+
        while (stable_mail_commands != NULL) {
                struct mail_command *cmd = stable_mail_commands;
 
@@ -168,8 +170,9 @@ void mail_commands_free_memory(void)
 
                if (global_used_memory < stats_settings->memory_limit)
                        break;
-               if (ioloop_time -
-                   stable_mail_commands->last_update.tv_sec < stats_settings->command_min_time)
+
+               diff = ioloop_time - stable_mail_commands->last_update.tv_sec;
+               if (diff < stats_settings->command_min_time)
                        break;
        }
 }
index 49b5350b2886d4b79ec6ef0514960b2ba3962e4a..24e2c352f79d26a5d9316c4dcbb460f8571a2066 100644 (file)
@@ -95,13 +95,16 @@ void mail_domain_refresh(struct mail_domain *domain,
 
 void mail_domains_free_memory(void)
 {
+       unsigned int diff;
+
        while (mail_domains_head != NULL && mail_domains_head->refcount == 0) {
                mail_domain_free(mail_domains_head);
 
                if (global_used_memory < stats_settings->memory_limit)
                        break;
-               if (ioloop_time -
-                   mail_domains_head->last_update.tv_sec < stats_settings->domain_min_time)
+
+               diff = ioloop_time - mail_domains_head->last_update.tv_sec;
+               if (diff < stats_settings->domain_min_time)
                        break;
        }
 }
index 4227fb6b8da61dc16abd74e9e2c879e661419255..69fc58fffdc3240997792e8aedea6e114ac667a6 100644 (file)
@@ -91,13 +91,16 @@ void mail_ip_refresh(struct mail_ip *ip, const struct mail_stats *diff_stats)
 
 void mail_ips_free_memory(void)
 {
+       unsigned int diff;
+
        while (mail_ips_head != NULL && mail_ips_head->refcount == 0) {
                mail_ip_free(mail_ips_head);
 
                if (global_used_memory < stats_settings->memory_limit)
                        break;
-               if (ioloop_time -
-                   mail_ips_head->last_update.tv_sec < stats_settings->ip_min_time)
+
+               diff = ioloop_time - mail_ips_head->last_update.tv_sec;
+               if (diff < stats_settings->ip_min_time)
                        break;
        }
 }
index d8251e07a9e95a27a48fd0fc1d698a62c361c0b8..790396d5f582c4e10f629d2396f14cb0f0674d5a 100644 (file)
@@ -246,6 +246,8 @@ int mail_session_update_parse(const char *const *args, const char **error_r)
 
 void mail_sessions_free_memory(void)
 {
+       unsigned int diff;
+
        while (mail_sessions_head != NULL &&
               mail_sessions_head->refcount == 0) {
                i_assert(mail_sessions_head->disconnected);
@@ -253,8 +255,9 @@ void mail_sessions_free_memory(void)
 
                if (global_used_memory < stats_settings->memory_limit)
                        break;
-               if (ioloop_time -
-                   mail_sessions_head->last_update.tv_sec < stats_settings->session_min_time)
+
+               diff = ioloop_time - mail_sessions_head->last_update.tv_sec;
+               if (diff < stats_settings->session_min_time)
                        break;
        }
 }
index 299844f73f72331afe281e04f1187915fc4938db..5f833e516c8c1dafc9200d2f29b5cbd0d84157a0 100644 (file)
@@ -112,13 +112,16 @@ void mail_user_refresh(struct mail_user *user,
 
 void mail_users_free_memory(void)
 {
+       unsigned int diff;
+
        while (mail_users_head != NULL && mail_users_head->refcount == 0) {
                mail_user_free(mail_users_head);
 
                if (global_used_memory < stats_settings->memory_limit)
                        break;
-               if (ioloop_time -
-                   mail_users_head->last_update.tv_sec < stats_settings->user_min_time)
+
+               diff = ioloop_time - mail_users_head->last_update.tv_sec;
+               if (diff < stats_settings->user_min_time)
                        break;
        }
 }