diff --git a/src/plugins/accounting_storage/mysql/as_mysql_rollup.c b/src/plugins/accounting_storage/mysql/as_mysql_rollup.c index d8b2e47faf8348ea5d59861528f2cbb1e301145e..a4c68203984a2873a453dba32b7fe8412ccb387b 100644 --- a/src/plugins/accounting_storage/mysql/as_mysql_rollup.c +++ b/src/plugins/accounting_storage/mysql/as_mysql_rollup.c @@ -97,8 +97,8 @@ static void _destroy_local_resv_usage(void *object) } extern int as_mysql_hourly_rollup(mysql_conn_t *mysql_conn, - char *cluster_name, - time_t start, time_t end) + char *cluster_name, + time_t start, time_t end) { int rc = SLURM_SUCCESS; int add_sec = 3600; @@ -969,8 +969,8 @@ end_it: return rc; } extern int as_mysql_daily_rollup(mysql_conn_t *mysql_conn, - char *cluster_name, - time_t start, time_t end, uint16_t archive_data) + char *cluster_name, + time_t start, time_t end, uint16_t archive_data) { /* can't just add 86400 since daylight savings starts and ends every * once in a while @@ -1077,8 +1077,9 @@ extern int as_mysql_daily_rollup(mysql_conn_t *mysql_conn, return SLURM_SUCCESS; } extern int as_mysql_monthly_rollup(mysql_conn_t *mysql_conn, - char *cluster_name, - time_t start, time_t end, uint16_t archive_data) + char *cluster_name, + time_t start, time_t end, + uint16_t archive_data) { int rc = SLURM_SUCCESS; struct tm start_tm; diff --git a/src/plugins/accounting_storage/mysql/as_mysql_usage.c b/src/plugins/accounting_storage/mysql/as_mysql_usage.c index e8faafc3099a5bc31c320b72a26c999cad2ed9de..2d73d163a70d2c7f9ddd4117079318fe6b83bd2b 100644 --- a/src/plugins/accounting_storage/mysql/as_mysql_usage.c +++ b/src/plugins/accounting_storage/mysql/as_mysql_usage.c @@ -544,8 +544,8 @@ is_user: } extern int as_mysql_roll_usage(mysql_conn_t *mysql_conn, - time_t sent_start, time_t sent_end, - uint16_t archive_data) + time_t sent_start, time_t sent_end, + uint16_t archive_data) { int rc = SLURM_SUCCESS; int i = 0; @@ -724,7 +724,7 @@ extern int as_mysql_roll_usage(mysql_conn_t *mysql_conn, itr = list_iterator_create(as_mysql_cluster_list); while((tmp = list_next(itr))) { if((rc = as_mysql_hourly_rollup(mysql_conn, tmp, - start_time, end_time)) + start_time, end_time)) != SLURM_SUCCESS) break; } @@ -765,8 +765,8 @@ extern int as_mysql_roll_usage(mysql_conn_t *mysql_conn, itr = list_iterator_create(as_mysql_cluster_list); while((tmp = list_next(itr))) { if((rc = as_mysql_daily_rollup(mysql_conn, tmp, - start_time, end_time, - archive_data)) + start_time, end_time, + archive_data)) != SLURM_SUCCESS) break; }