makary/bookmarkfs
1
0
Fork 0
mirror of https://git.sr.ht/~cismonx/bookmarkfs synced 2025-06-07 19:58:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend: rename object_free -> cookie_free

Browse source
This commit is contained in:
CismonX 2025-02-03 18:15:52 +08:00
parent f92054bdf5
commit d0aa74b212
No known key found for this signature in database
GPG key ID: 3094873E29A482FB
6 changed files with 31 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/bookmarkfs.texi
View file

@ -1472,7 +1472,7 @@ struct bookmarkfs_backend @{
bookmarkfs_bookmark_set_func *bookmark_set; bookmarkfs_bookmark_set_func *bookmark_set;
bookmarkfs_bookmark_sync_func *bookmark_sync; bookmarkfs_bookmark_sync_func *bookmark_sync;
bookmarkfs_object_free_func *object_free; bookmarkfs_cookie_free_func *cookie_free;
@}; @};
@end example @end example

14
src/backend.h
View file

@ -82,9 +82,9 @@ enum bookmarkfs_bookmark_type {
BOOKMARKFS_BOOKMARK_TYPE_KEYWORD, BOOKMARKFS_BOOKMARK_TYPE_KEYWORD,
}; };
enum bookmarkfs_object_type { enum bookmarkfs_cookie_type {
BOOKMARKFS_OBJECT_TYPE_BGCOOKIE, BOOKMARKFS_COOKIE_TYPE_WATCH,
BOOKMARKFS_OBJECT_TYPE_BLCOOKIE, BOOKMARKFS_COOKIE_TYPE_LIST,
}; };
struct bookmarkfs_backend_conf; struct bookmarkfs_backend_conf;
@ -220,10 +220,10 @@ typedef int (bookmarkfs_bookmark_sync_func) (
void *backend_ctx void *backend_ctx
); );
typedef void (bookmarkfs_object_free_func) ( typedef void (bookmarkfs_cookie_free_func) (
void *backend_ctx, void *backend_ctx,
void *object, void *cookie,
enum bookmarkfs_object_type object_type enum bookmarkfs_cookie_type cookie_type
); );
struct bookmarkfs_backend { struct bookmarkfs_backend {
@ -246,7 +246,7 @@ struct bookmarkfs_backend {
bookmarkfs_bookmark_set_func *bookmark_set; bookmarkfs_bookmark_set_func *bookmark_set;
bookmarkfs_bookmark_sync_func *bookmark_sync; bookmarkfs_bookmark_sync_func *bookmark_sync;
bookmarkfs_object_free_func *object_free; bookmarkfs_cookie_free_func *cookie_free;
}; };
struct bookmarkfs_backend_conf { struct bookmarkfs_backend_conf {

20
src/backend_chromium.c
View file

@ -2117,22 +2117,22 @@ bookmark_lookup (
} }
static void static void
object_free ( cookie_free (
void *UNUSED_VAR(backend_ctx), void *UNUSED_VAR(backend_ctx),
void *object, void *cookie,
enum bookmarkfs_object_type object_type enum bookmarkfs_cookie_type cookie_type
) { ) {
if (object == NULL) { if (cookie == NULL) {
return; return;
} }
switch (object_type) { switch (cookie_type) {
case BOOKMARKFS_OBJECT_TYPE_BGCOOKIE: case BOOKMARKFS_COOKIE_TYPE_WATCH:
free_bgcookie(object); free_bgcookie(cookie);
break; break;
case BOOKMARKFS_OBJECT_TYPE_BLCOOKIE: case BOOKMARKFS_COOKIE_TYPE_LIST:
free_blcookie(object); free_blcookie(cookie);
break; break;
default: default:
@ -2706,7 +2706,7 @@ struct bookmarkfs_backend const bookmarkfs_backend_chromium = {
.bookmark_list = bookmark_list, .bookmark_list = bookmark_list,
.bookmark_lookup = bookmark_lookup, .bookmark_lookup = bookmark_lookup,
.object_free = object_free, .cookie_free = cookie_free,
#ifdef BOOKMARKFS_BACKEND_CHROMIUM_WRITE #ifdef BOOKMARKFS_BACKEND_CHROMIUM_WRITE
.backend_mkfs = backend_mkfs, .backend_mkfs = backend_mkfs,

20
src/backend_firefox.c
View file

@ -3192,22 +3192,22 @@ bookmark_lookup (
} }
static void static void
object_free ( cookie_free (
void *UNUSED_VAR(backend_ctx), void *UNUSED_VAR(backend_ctx),
void *object, void *cookie,
enum bookmarkfs_object_type object_type enum bookmarkfs_cookie_type cookie_type
) { ) {
if (object == NULL) { if (cookie == NULL) {
return; return;
} }
switch (object_type) { switch (cookie_type) {
case BOOKMARKFS_OBJECT_TYPE_BGCOOKIE: case BOOKMARKFS_COOKIE_TYPE_WATCH:
free(object); free(cookie);
break; break;
case BOOKMARKFS_OBJECT_TYPE_BLCOOKIE: case BOOKMARKFS_COOKIE_TYPE_LIST:
free_blcookie(object); free_blcookie(cookie);
break; break;
default: default:
@ -3733,7 +3733,7 @@ struct bookmarkfs_backend const bookmarkfs_backend_firefox = {
.bookmark_list = bookmark_list, .bookmark_list = bookmark_list,
.bookmark_lookup = bookmark_lookup, .bookmark_lookup = bookmark_lookup,
.object_free = object_free, .cookie_free = cookie_free,
#ifdef BOOKMARKFS_BACKEND_FIREFOX_WRITE #ifdef BOOKMARKFS_BACKEND_FIREFOX_WRITE
.backend_mkfs = backend_mkfs, .backend_mkfs = backend_mkfs,

4
src/fs_ops.c
View file

@ -500,7 +500,7 @@ bm_free (
free(fh->buf); free(fh->buf);
} }
if (fh->cookie != NULL) { if (fh->cookie != NULL) {
BACKEND_CALL(object_free, fh->cookie, BOOKMARKFS_OBJECT_TYPE_BGCOOKIE); BACKEND_CALL(cookie_free, fh->cookie, BOOKMARKFS_COOKIE_TYPE_WATCH);
} }
bm_fh_free(fh, -1); bm_fh_free(fh, -1);
return status; return status;
@ -512,7 +512,7 @@ bm_freedir (
fuse_ino_t ino, fuse_ino_t ino,
void *cookie void *cookie
) { ) {
BACKEND_CALL(object_free, cookie, BOOKMARKFS_OBJECT_TYPE_BLCOOKIE); BACKEND_CALL(cookie_free, cookie, BOOKMARKFS_COOKIE_TYPE_LIST);
unsigned long entry_id; unsigned long entry_id;
struct fs_file_handle *fh = bm_fh_get(ino, NULL, &entry_id); struct fs_file_handle *fh = bm_fh_get(ino, NULL, &entry_id);

3
src/fsck_offline.c
View file

@ -162,8 +162,7 @@ free_dir (
struct fsck_ctx const *ctx, struct fsck_ctx const *ctx,
struct fsck_dir const *dir struct fsck_dir const *dir
) { ) {
BACKEND_CALL(ctx, object_free, BACKEND_CALL(ctx, cookie_free, dir->cookie, BOOKMARKFS_COOKIE_TYPE_LIST);
dir->cookie, BOOKMARKFS_OBJECT_TYPE_BLCOOKIE);
} }
static int static int