From e51e667d959f7c0307940a1d85a5873bee1b78b3 Mon Sep 17 00:00:00 2001 From: kanoi Date: Sun, 10 Jul 2016 00:48:14 +1000 Subject: [PATCH] ckdb - fix exits in keysummary code --- src/ckdb.h | 4 ++-- src/ckdb_dbio.c | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/ckdb.h b/src/ckdb.h index a792a3b8..2a11a75f 100644 --- a/src/ckdb.h +++ b/src/ckdb.h @@ -52,7 +52,7 @@ #define DB_VLOCK "1" #define DB_VERSION "1.0.7" -#define CKDB_VERSION DB_VERSION"-2.201" +#define CKDB_VERSION DB_VERSION"-2.202" #define WHERE_FFL " - from %s %s() line %d" #define WHERE_FFL_HERE __FILE__, __func__, __LINE__ @@ -3475,7 +3475,7 @@ extern bool markersummary_add(PGconn *conn, K_ITEM *ms_item, char *by, char *cod char *inet, tv_t *cd, K_TREE *trf_root); extern bool markersummary_fill(PGconn *conn); extern bool keysummary_add(PGconn *conn, K_ITEM *ks_item, char *by, char *code, - char *inet, tv_t *cd, K_TREE *trf_root); + char *inet, tv_t *cd); #define workmarkers_process(_conn, _already, _add, _markerid, _poolinstance, \ _workinfoidend, _workinfoidstart, _description, \ _status, _by, _code, _inet, _cd, _trf_root) \ diff --git a/src/ckdb_dbio.c b/src/ckdb_dbio.c index c73b33f1..331e75e3 100644 --- a/src/ckdb_dbio.c +++ b/src/ckdb_dbio.c @@ -4661,6 +4661,8 @@ bool sharesummaries_to_markersummaries(PGconn *conn, WORKMARKERS *workmarkers, setnow(&add_fin); setnow(&kadd_stt); + INIT_KEYSUMMARY(&ks_look); + ks_item = NULL; lookkeysharesummary.workinfoid = workmarkers->workinfoidend; @@ -4790,8 +4792,7 @@ bool sharesummaries_to_markersummaries(PGconn *conn, WORKMARKERS *workmarkers, setnow(&kdb_stt); ks_item = STORE_HEAD_NOLOCK(new_keysummary_store); while (ks_item) { - if (!(keysummary_add(conn, ks_item, by, code, inet, - cd, trf_root))) { + if (!(keysummary_add(conn, ks_item, by, code, inet, cd))) { reason = "db error"; setnow(&kdb_fin); goto rollback; @@ -8489,7 +8490,7 @@ flail: } bool keysummary_add(PGconn *conn, K_ITEM *ks_item, char *by, char *code, - char *inet, tv_t *cd, K_TREE *trf_root) + char *inet, tv_t *cd) { ExecStatusType rescode; bool conned = false; @@ -8506,7 +8507,6 @@ bool keysummary_add(PGconn *conn, K_ITEM *ks_item, char *by, char *code, DATA_KEYSUMMARY(row, ks_item); SIMPLEDATEPOINTERS(markersummary_free, row, cd, by, code, inet); - SIMPLEDATEPTRTRANSFER(markersummary_free, trf_root, row); par = 0; params[par++] = bigint_to_buf(row->markerid, NULL, 0);