From 94c5e01038a819e8abd062ed81aec321cdff4aa3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Sat, 17 Jul 2021 15:09:20 +0300 Subject: [PATCH] adb: remove the now unused get_default_int() hook It is no longer needed, and can be later reintroduced if needed. --- src/adb.c | 8 +------- src/adb.h | 1 - 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/adb.c b/src/adb.c index 3a7c684..640f01b 100644 --- a/src/adb.c +++ b/src/adb.c @@ -384,10 +384,7 @@ adb_val_t adb_ro_val(const struct adb_obj *o, unsigned i) uint32_t adb_ro_int(const struct adb_obj *o, unsigned i) { - adb_val_t val = adb_ro_val(o, i); - if (val == ADB_NULL && o->schema && o->schema->get_default_int) - return o->schema->get_default_int(i); - return adb_r_int(o->db, val); + return adb_r_int(o->db, adb_ro_val(o, i)); } apk_blob_t adb_ro_blob(const struct adb_obj *o, unsigned i) @@ -826,9 +823,6 @@ adb_val_t adb_wo_val_fromstring(struct adb_obj *o, unsigned i, apk_blob_t val) adb_val_t adb_wo_int(struct adb_obj *o, unsigned i, uint32_t v) { - if (o->schema && o->schema->get_default_int && - v == o->schema->get_default_int(i)) - return ADB_NULL; return adb_wo_val(o, i, adb_w_int(o->db, v)); } diff --git a/src/adb.h b/src/adb.h index fd5462b..146ad07 100644 --- a/src/adb.h +++ b/src/adb.h @@ -102,7 +102,6 @@ struct adb_object_schema { apk_blob_t (*tostring)(struct adb_obj *, char *, size_t); int (*fromstring)(struct adb_obj *, apk_blob_t); - uint32_t (*get_default_int)(unsigned i); int (*compare)(const struct adb_obj *, const struct adb_obj *); void (*pre_commit)(struct adb_obj *);