diff --git a/src/db/db.h b/src/db/db.h index a264c75..7ccc9a3 100644 --- a/src/db/db.h +++ b/src/db/db.h @@ -50,8 +50,8 @@ int32_t init_db_connection(); int32_t db_save_file(session *s); int32_t db_user_auth(i_auth_t *credentials, o_auth_t *response); s_file_t *db_get_file(i_get_file_db *arg); -int64_t db_get_files_data(i_get_files_db *arg, fl_t **fl_start, - int64_t *full_count); +int32_t db_get_files_data(i_get_files_db *arg, fl_t **fl_start, + int32_t *full_count); int32_t db_user_create(i_db_user_create *); int db_close_connection(void); #endif \ No newline at end of file diff --git a/src/db/db_postgresql.c b/src/db/db_postgresql.c index a908b6e..5de312a 100644 --- a/src/db/db_postgresql.c +++ b/src/db/db_postgresql.c @@ -306,8 +306,8 @@ s_file_t *db_get_file(i_get_file_db *arg) { return sf; } -int64_t db_get_files_data(i_get_files_db *arg, fl_t **fl_start, - int64_t *full_count) { +int32_t db_get_files_data(i_get_files_db *arg, fl_t **fl_start, + int32_t *full_count) { fl_t *fl_current; char query[512]; char sort_by[16] = "id"; diff --git a/src/db/db_sqlite.c b/src/db/db_sqlite.c index a9d8729..be70c05 100644 --- a/src/db/db_sqlite.c +++ b/src/db/db_sqlite.c @@ -422,8 +422,8 @@ enum db_cb_resp db_get_files_count_db(sqlite3_stmt *stmt, void *resp) { return db_success; } -int64_t db_get_files_data(i_get_files_db *arg, fl_t **fl_start, - int64_t *full_count) { +int32_t db_get_files_data(i_get_files_db *arg, fl_t **fl_start, + int32_t *full_count) { fl_t *fl_current = NULL; char zSql[512]; struct db_get_files_data data = {.fl_current = &fl_current, diff --git a/src/file_p.c b/src/file_p.c index 0bfdd62..5d56c45 100644 --- a/src/file_p.c +++ b/src/file_p.c @@ -76,7 +76,7 @@ void file_list(session *sess, server_data_t *s_d, i_file_list_t *f_args) { if ((full_count > f_args->limit) && (pages_count % f_args->limit)) pages_count++; - sprintf(page_info, ":END: PAGE %u/%lu COUNT: %lu/%lu\n", f_args->page, + sprintf(page_info, ":END: PAGE %u/%d COUNT: %d/%d\n", f_args->page, pages_count, count, full_count - (f_args->page - 1) * f_args->limit); /* case: no files */