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 ATTR_KEY_* -> BM_XATTR_*

Browse source
This commit is contained in:
CismonX 2025-02-26 13:56:18 +08:00
parent 55c0726c7f
commit d01554400c
No known key found for this signature in database
GPG key ID: 3094873E29A482FB
2 changed files with 41 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/backend_chromium.c
View file

@ -74,10 +74,10 @@
#define BOOKMARKS_ROOT_ID 0 #define BOOKMARKS_ROOT_ID 0
enum { enum {
ATTR_KEY_NULL, BM_XATTR_NULL,
ATTR_KEY_DATE_ADDED, BM_XATTR_DATE_ADDED,
ATTR_KEY_GUID, BM_XATTR_GUID,
ATTR_KEY_TITLE, BM_XATTR_TITLE,
}; };
enum dirty_level { enum dirty_level {
@ -956,18 +956,18 @@ get_attr_type (
uint32_t flags uint32_t flags
) { ) {
if (key == NULL) { if (key == NULL) {
return ATTR_KEY_NULL; return BM_XATTR_NULL;
} }
if (0 == strcmp("date_added", key)) { if (0 == strcmp("date_added", key)) {
return ATTR_KEY_DATE_ADDED; return BM_XATTR_DATE_ADDED;
} }
if (flags & BACKEND_FILENAME_GUID) { if (flags & BACKEND_FILENAME_GUID) {
if (0 == strcmp("title", key)) { if (0 == strcmp("title", key)) {
return ATTR_KEY_TITLE; return BM_XATTR_TITLE;
} }
} else { } else {
if (0 == strcmp("guid", key)) { if (0 == strcmp("guid", key)) {
return ATTR_KEY_GUID; return BM_XATTR_GUID;
} }
} }
return -1; return -1;
@ -984,19 +984,19 @@ get_attr_val (
int key_type = get_attr_type(attr_key, flags); int key_type = get_attr_type(attr_key, flags);
switch (key_type) { switch (key_type) {
case ATTR_KEY_NULL: case BM_XATTR_NULL:
value = json_object_sget(node, "url"); value = json_object_sget(node, "url");
break; break;
case ATTR_KEY_DATE_ADDED: case BM_XATTR_DATE_ADDED:
value = json_object_sget(node, "date_added"); value = json_object_sget(node, "date_added");
break; break;
case ATTR_KEY_GUID: case BM_XATTR_GUID:
value = json_object_sget(node, "guid"); value = json_object_sget(node, "guid");
break; break;
case ATTR_KEY_TITLE: case BM_XATTR_TITLE:
value = json_object_sget(node, "name"); value = json_object_sget(node, "name");
break; break;
@ -2644,13 +2644,13 @@ bookmark_set (
bool nocheck = true; bool nocheck = true;
switch (key_type) { switch (key_type) {
case ATTR_KEY_DATE_ADDED: case BM_XATTR_DATE_ADDED:
if (0 != parse_ts(val, val_len, NULL)) { if (0 != parse_ts(val, val_len, NULL)) {
return -EINVAL; return -EINVAL;
} }
break; break;
case ATTR_KEY_GUID: ; case BM_XATTR_GUID: ;
uint8_t guid[UUID_LEN]; uint8_t guid[UUID_LEN];
if (0 != parse_guid(val, val_len, guid)) { if (0 != parse_guid(val, val_len, guid)) {
return -EINVAL; return -EINVAL;
@ -2665,7 +2665,7 @@ bookmark_set (
update_guid(entry, ctx->guid_map, entry_id, guid, hashcode); update_guid(entry, ctx->guid_map, entry_id, guid, hashcode);
break; break;
case ATTR_KEY_TITLE: case BM_XATTR_TITLE:
if (NULL != memchr(val, '\0', val_len)) { if (NULL != memchr(val, '\0', val_len)) {
return -EINVAL; return -EINVAL;
} }
@ -2683,7 +2683,7 @@ bookmark_set (
} }
ctx->dirty = DIRTY_LEVEL_DATA; ctx->dirty = DIRTY_LEVEL_DATA;
if (key_type != ATTR_KEY_NULL && ctx->flags & BOOKMARKFS_BACKEND_CTIME) { if (key_type != BM_XATTR_NULL && ctx->flags & BOOKMARKFS_BACKEND_CTIME) {
if (unlikely(0 != node_mtime_now(entry->node, NULL))) { if (unlikely(0 != node_mtime_now(entry->node, NULL))) {
return -EIO; return -EIO;
} }

50
src/backend_firefox.c
View file

@ -55,12 +55,12 @@
#include "version.h" #include "version.h"
#include "xstd.h" #include "xstd.h"
#define ATTR_KEY_NULL 0 #define BM_XATTR_NULL 0
#define ATTR_KEY_DESC 1 #define BM_XATTR_DESC 1
#define ATTR_KEY_TITLE 2 #define BM_XATTR_TITLE 2
#define ATTR_KEY_GUID 3 #define BM_XATTR_GUID 3
#define ATTR_KEY_DATE_ADDED 4 #define BM_XATTR_DATE_ADDED 4
#define ATTR_IN_MOZBM_START ATTR_KEY_TITLE #define MOZBM_XATTR_START BM_XATTR_TITLE
#define BACKEND_EXCLUSIVE_LOCK ( 1u << 16 ) #define BACKEND_EXCLUSIVE_LOCK ( 1u << 16 )
#define BACKEND_FILENAME_GUID ( 1u << 17 ) #define BACKEND_FILENAME_GUID ( 1u << 17 )
@ -2038,19 +2038,19 @@ bookmark_do_get (
#define BOOKMARK_GET_(cols, join) "SELECT CASE ? " cols "END " \ #define BOOKMARK_GET_(cols, join) "SELECT CASE ? " cols "END " \
"FROM `moz_bookmarks` `b` " join "WHERE `b`.`id` = ?" "FROM `moz_bookmarks` `b` " join "WHERE `b`.`id` = ?"
#define BOOKMARK_GET(cols) BOOKMARK_GET_(cols \ #define BOOKMARK_GET(cols) BOOKMARK_GET_(cols \
"WHEN " STRINGIFY(ATTR_KEY_DATE_ADDED) " THEN `b`.`dateAdded` ", ) "WHEN " STRINGIFY(BM_XATTR_DATE_ADDED) " THEN `b`.`dateAdded` ", )
#define BOOKMARK_GET_EX BOOKMARK_GET_( \ #define BOOKMARK_GET_EX BOOKMARK_GET_( \
"WHEN " STRINGIFY(ATTR_KEY_NULL) " THEN `p`.`url` " \ "WHEN " STRINGIFY(BM_XATTR_NULL) " THEN `p`.`url` " \
"WHEN " STRINGIFY(ATTR_KEY_DESC) " THEN `p`.`description` " \ "WHEN " STRINGIFY(BM_XATTR_DESC) " THEN `p`.`description` " \
, "LEFT JOIN `moz_places` `p` ON `b`.`fk` = `p`.`id` ") , "LEFT JOIN `moz_places` `p` ON `b`.`fk` = `p`.`id` ")
#define BOOKMARK_GET_WITH_GUID \ #define BOOKMARK_GET_WITH_GUID \
BOOKMARK_GET("WHEN " STRINGIFY(ATTR_KEY_GUID) " THEN `b`.`guid` ") BOOKMARK_GET("WHEN " STRINGIFY(BM_XATTR_GUID) " THEN `b`.`guid` ")
#define BOOKMARK_GET_WITH_TITLE \ #define BOOKMARK_GET_WITH_TITLE \
BOOKMARK_GET("WHEN " STRINGIFY(ATTR_KEY_TITLE) " THEN `b`.`title` ") BOOKMARK_GET("WHEN " STRINGIFY(BM_XATTR_TITLE) " THEN `b`.`title` ")
sqlite3_stmt **stmt_ptr = &ctx->stmts[STMT_BOOKMARK_GET_EX]; sqlite3_stmt **stmt_ptr = &ctx->stmts[STMT_BOOKMARK_GET_EX];
char const *sql = BOOKMARK_GET_EX; char const *sql = BOOKMARK_GET_EX;
if (attr_type >= ATTR_IN_MOZBM_START) { if (attr_type >= MOZBM_XATTR_START) {
stmt_ptr = &ctx->stmts[STMT_BOOKMARK_GET]; stmt_ptr = &ctx->stmts[STMT_BOOKMARK_GET];
sql = BOOKMARK_GET_WITH_GUID; sql = BOOKMARK_GET_WITH_GUID;
if (ctx->flags & BACKEND_FILENAME_GUID) { if (ctx->flags & BACKEND_FILENAME_GUID) {
@ -2565,21 +2565,21 @@ get_attr_type (
uint32_t flags uint32_t flags
) { ) {
if (key == NULL) { if (key == NULL) {
return ATTR_KEY_NULL; return BM_XATTR_NULL;
} }
if (0 == strcmp("date_added", key)) { if (0 == strcmp("date_added", key)) {
return ATTR_KEY_DATE_ADDED; return BM_XATTR_DATE_ADDED;
} }
if (0 == strcmp("description", key)) { if (0 == strcmp("description", key)) {
return ATTR_KEY_DESC; return BM_XATTR_DESC;
} }
if (flags & BACKEND_FILENAME_GUID) { if (flags & BACKEND_FILENAME_GUID) {
if (0 == strcmp("title", key)) { if (0 == strcmp("title", key)) {
return ATTR_KEY_TITLE; return BM_XATTR_TITLE;
} }
} else { } else {
if (0 == strcmp("guid", key)) { if (0 == strcmp("guid", key)) {
return ATTR_KEY_GUID; return BM_XATTR_GUID;
} }
} }
return -1; return -1;
@ -3613,7 +3613,7 @@ bookmark_set (
.last_visit_date = -1, .last_visit_date = -1,
}; };
int attr_type = ATTR_IN_MOZBM_START; int attr_type = MOZBM_XATTR_START;
if (flags & BOOKMARK_FLAG(SET_TIME)) { if (flags & BOOKMARK_FLAG(SET_TIME)) {
struct timespec const *times = val; struct timespec const *times = val;
place_cols.last_visit_date = timespec_to_msecs(&times[0]); place_cols.last_visit_date = timespec_to_msecs(&times[0]);
@ -3624,17 +3624,17 @@ bookmark_set (
} else { } else {
attr_type = get_attr_type(attr_key, ctx->flags); attr_type = get_attr_type(attr_key, ctx->flags);
switch (attr_type) { switch (attr_type) {
case ATTR_KEY_NULL: case BM_XATTR_NULL:
place_cols.url = val; place_cols.url = val;
place_cols.url_len = val_len; place_cols.url_len = val_len;
break; break;
case ATTR_KEY_DESC: case BM_XATTR_DESC:
place_cols.desc = val; place_cols.desc = val;
place_cols.desc_len = val_len; place_cols.desc_len = val_len;
break; break;
case ATTR_KEY_TITLE: case BM_XATTR_TITLE:
if (NULL != memchr(val, '\0', val_len)) { if (NULL != memchr(val, '\0', val_len)) {
return -EINVAL; return -EINVAL;
} }
@ -3642,14 +3642,14 @@ bookmark_set (
bm_cols.title_len = val_len; bm_cols.title_len = val_len;
break; break;
case ATTR_KEY_GUID: case BM_XATTR_GUID:
if (!is_valid_guid(val, val_len)) { if (!is_valid_guid(val, val_len)) {
return -EINVAL; return -EINVAL;
} }
bm_cols.guid = val; bm_cols.guid = val;
break; break;
case ATTR_KEY_DATE_ADDED: case BM_XATTR_DATE_ADDED:
if (0 != parse_msecs(val, val_len, &bm_cols.date_added)) { if (0 != parse_msecs(val, val_len, &bm_cols.date_added)) {
return -EINVAL; return -EINVAL;
} }
@ -3659,7 +3659,7 @@ bookmark_set (
return -ENOATTR; return -ENOATTR;
} }
if (attr_type != ATTR_KEY_NULL if (attr_type != BM_XATTR_NULL
&& ctx->flags & BOOKMARKFS_BACKEND_CTIME && ctx->flags & BOOKMARKFS_BACKEND_CTIME
) { ) {
struct timespec now; struct timespec now;
@ -3680,7 +3680,7 @@ bookmark_set (
status = -EPERM; status = -EPERM;
goto fail; goto fail;
} }
if (attr_type >= ATTR_IN_MOZBM_START) { if (attr_type >= MOZBM_XATTR_START) {
goto end; goto end;
} }