From 78b80be2e5d37d23a19e76597d69d807e908d60a Mon Sep 17 00:00:00 2001 From: CismonX Date: Fri, 31 Jan 2025 20:31:52 +0800 Subject: [PATCH] backend: rename struct `bookmarkfs_bookmark_entry` Rename field `next` -> `off`. --- src/backend.h | 2 +- src/backend_chromium.c | 4 ++-- src/backend_firefox.c | 2 +- src/fs_ops.c | 4 ++-- src/fsck_offline.c | 6 +++--- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/backend.h b/src/backend.h index dec863a..67a4964 100644 --- a/src/backend.h +++ b/src/backend.h @@ -278,7 +278,7 @@ struct bookmarkfs_bookmark_stat { struct bookmarkfs_bookmark_entry { char const *name; - off_t next; + off_t off; struct bookmarkfs_bookmark_stat stat; }; diff --git a/src/backend_chromium.c b/src/backend_chromium.c index 50c86cf..745c595 100644 --- a/src/backend_chromium.c +++ b/src/backend_chromium.c @@ -1376,7 +1376,7 @@ static int parse_entry ( struct backend_ctx const *ctx, json_t const *node, - off_t next, + off_t off, bool with_stat, struct bookmarkfs_bookmark_entry *buf ) { @@ -1389,7 +1389,7 @@ parse_entry ( } buf->name = entry->name; - buf->next = next; + buf->off = off; buf->stat.id = id; if (ctx->flags & BACKEND_FILENAME_GUID) { json_t const *guid_node = json_object_sget(entry->node, "guid"); diff --git a/src/backend_firefox.c b/src/backend_firefox.c index 2e2315d..fec83c0 100644 --- a/src/backend_firefox.c +++ b/src/backend_firefox.c @@ -2413,7 +2413,7 @@ bookmark_list_cb ( if (unlikely(position < 0)) { goto fail; } - entry.next = position + 1; + entry.off = position + 1; ssize_t len = -1; if (SQLITE_INTEGER == sqlite3_column_type(stmt, 3)) { diff --git a/src/fs_ops.c b/src/fs_ops.c index 72ddec2..5fbc9d5 100644 --- a/src/fs_ops.c +++ b/src/fs_ops.c @@ -966,10 +966,10 @@ bm_readdir_cb ( size_t entry_size; if (is_readdirplus) { entry_size = fuse_add_direntry_plus(rctx->req, buf, buf_len, - entry->name, &ep, entry->next); + entry->name, &ep, entry->off); } else { entry_size = fuse_add_direntry(rctx->req, buf, buf_len, entry->name, - &ep.attr, entry->next); + &ep.attr, entry->off); } if (entry_size > buf_len) { return 1; diff --git a/src/fsck_offline.c b/src/fsck_offline.c index e1e9735..f6f0a20 100644 --- a/src/fsck_offline.c +++ b/src/fsck_offline.c @@ -130,7 +130,7 @@ do_list ( uint64_t *subdir_id_ptr ) { struct bookmarkfs_bookmark_entry entry = { - .next = dir->off, + .off = dir->off, .stat.id = UINT64_MAX, }; int status = BACKEND_CALL(ctx, bookmark_list, dir->id, dir->off, 0, @@ -138,7 +138,7 @@ do_list ( if (status < 0) { return status; } - dir->off = entry.next; + dir->off = entry.off; *subdir_id_ptr = entry.stat.id; return 0; } @@ -153,7 +153,7 @@ do_list_cb ( if (entry->stat.value_len >= 0) { return 0; } - result->next = entry->next; + result->off = entry->off; result->stat.id = entry->stat.id; return 1; }