diff options
| author |   José Bollo <jose.bollo@iot.bzh> | 2017-10-25 16:32:17 +0200 |
|---|---|---|
| committer | José Bollo <jose.bollo@iot.bzh> | 2017-10-25 16:32:17 +0200 |
| commit | e56b5c07d60ae8d411d8cf4e7bad4c8721e1724e (patch) | |
| tree | 04c93d2768046caf05d7eeb380efab4e53134726 /ll-database-binding/src/ll-database-binding.c | |
| parent | 19063b9ccf1cdf7471f7ac88ae82b391f48eae6f (diff) | |
database: compatibility with gdbm 1.12
Change-Id: I1362cf4fa1c68b80ba0f25926e4fb5fd9d6590d2
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
Diffstat (limited to 'll-database-binding/src/ll-database-binding.c')
| -rw-r--r-- | ll-database-binding/src/ll-database-binding.c | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/ll-database-binding/src/ll-database-binding.c b/ll-database-binding/src/ll-database-binding.c index c9f49f1..e08156e 100644 --- a/ll-database-binding/src/ll-database-binding.c +++ b/ll-database-binding/src/ll-database-binding.c @@ -167,6 +167,12 @@ static void verb_read(struct afb_req req) #define DATA_STR(k) ((char*)((k).dptr)) #define DATA_SZ(k) ((size_t)((k).dsize)) +#if GDBM_VERSION_MAJOR > 1 || (GDBM_VERSION_MAJOR == 1 && GDBM_VERSION_MINOR >= 13) +# define IFSYS(yes,no) (gdbm_syserr[gdbm_errno] ? (yes) : (no)) +#else +# define IFSYS(yes,no) (no) +#endif + static GDBM_FILE database; static void onfatal(const char *text) @@ -179,9 +185,10 @@ static int xdb_open(const char *path) database = gdbm_open(path, 512, GDBM_WRCREAT|GDBM_SYNC, 0600, onfatal); if (!database) { - AFB_ERROR("Fail to open/create database: %s%s%s", gdbm_errlist[gdbm_errno], - gdbm_syserr[gdbm_errno] ? ", " : "", - gdbm_syserr[gdbm_errno] ? strerror(errno) : ""); + AFB_ERROR("Fail to open/create database: %s%s%s", + gdbm_errlist[gdbm_errno], + IFSYS(", ", ""), + IFSYS(strerror(errno), "")); return -1; } @@ -202,8 +209,8 @@ static void xdb_put(struct afb_req req, datum *key, datum *data, int replace) DATA_STR(*key), DATA_STR(*data), gdbm_errlist[gdbm_errno], - gdbm_syserr[gdbm_errno] ? ", " : "", - gdbm_syserr[gdbm_errno] ? strerror(errno) : ""); + IFSYS(", ", ""), + IFSYS(strerror(errno), "")); afb_req_fail_f(req, "failed", "%s", ret > 0 ? "key already exists" : gdbm_errlist[gdbm_errno]); } } @@ -220,8 +227,8 @@ static void xdb_delete(struct afb_req req, datum *key) AFB_ERROR("can't delete key %s: %s%s%s", DATA_STR(*key), gdbm_errlist[gdbm_errno], - gdbm_syserr[gdbm_errno] ? ", " : "", - gdbm_syserr[gdbm_errno] ? strerror(errno) : ""); + IFSYS(", ", ""), + IFSYS(strerror(errno), "")); afb_req_fail_f(req, "failed", "%s", gdbm_errlist[gdbm_errno]); } } @@ -244,8 +251,8 @@ static void xdb_get(struct afb_req req, datum *key) AFB_ERROR("can't get key %s: %s%s%s", DATA_STR(*key), gdbm_errlist[gdbm_errno], - gdbm_syserr[gdbm_errno] ? ", " : "", - gdbm_syserr[gdbm_errno] ? strerror(errno) : ""); + IFSYS(", ", ""), + IFSYS(strerror(errno), "")); afb_req_fail_f(req, "failed", "%s", gdbm_errlist[gdbm_errno]); } } |