From 536c1f3a6fd0919947c6caa5ce3367889ba8fcc1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9C=B1=E5=A4=A9=E9=BE=99=20=28Armink=29?= Date: Wed, 18 May 2022 20:27:07 +0800 Subject: [PATCH] [tsdb] remove #pragma pack and rename fdb_tsl_iter_reverse. --- inc/flashdb.h | 2 +- src/fdb_tsdb.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/inc/flashdb.h b/inc/flashdb.h index 6108f4e..f60c791 100644 --- a/inc/flashdb.h +++ b/inc/flashdb.h @@ -60,7 +60,7 @@ bool fdb_kv_iterate (fdb_kvdb_t db, fdb_kv_iterator_t itr); /* Time series log API like a TSDB */ fdb_err_t fdb_tsl_append (fdb_tsdb_t db, fdb_blob_t blob); void fdb_tsl_iter (fdb_tsdb_t db, fdb_tsl_cb cb, void *cb_arg); -void fdb_tsl_iter_rev (fdb_tsdb_t db, fdb_tsl_cb cb, void *arg) +void fdb_tsl_iter_reverse(fdb_tsdb_t db, fdb_tsl_cb cb, void *cb_arg); void fdb_tsl_iter_by_time(fdb_tsdb_t db, fdb_time_t from, fdb_time_t to, fdb_tsl_cb cb, void *cb_arg); size_t fdb_tsl_query_count (fdb_tsdb_t db, fdb_time_t from, fdb_time_t to, fdb_tsl_status_t status); fdb_err_t fdb_tsl_set_status (fdb_tsdb_t db, fdb_tsl_t tsl, fdb_tsl_status_t status); diff --git a/src/fdb_tsdb.c b/src/fdb_tsdb.c index 90cd9dd..9c048a5 100644 --- a/src/fdb_tsdb.c +++ b/src/fdb_tsdb.c @@ -72,8 +72,6 @@ if (result != FDB_NO_ERR) return result; \ } while(0); -#pragma pack(push,1) - struct sector_hdr_data { uint8_t status[FDB_STORE_STATUS_TABLE_SIZE]; /**< sector store status @see fdb_sector_store_status_t */ uint32_t magic; /**< magic word(`T`, `S`, `L`, `0`) */ @@ -96,8 +94,6 @@ struct log_idx_data { }; typedef struct log_idx_data *log_idx_data_t; -#pragma pack(pop) - struct query_count_args { fdb_tsl_status_t status; size_t count; @@ -450,7 +446,7 @@ fdb_err_t fdb_tsl_append(fdb_tsdb_t db, fdb_blob_t blob) * @param cb callback * @param arg callback argument */ -void fdb_tsl_iter_rev(fdb_tsdb_t db, fdb_tsl_cb cb, void *arg) +void fdb_tsl_iter_reverse(fdb_tsdb_t db, fdb_tsl_cb cb, void *arg) { struct tsdb_sec_info sector; uint32_t sec_addr, traversed_len = 0;