Browse Source

Merge branch 'master' of bitbucket.org:ckolivas/ckpool

master
Con Kolivas 10 years ago
parent
commit
52a380a90b
  1. 2
      src/ckdb.h
  2. 2
      src/ckdb_data.c
  3. 4
      src/ckdb_dbio.c

2
src/ckdb.h

@ -55,7 +55,7 @@
#define DB_VLOCK "1" #define DB_VLOCK "1"
#define DB_VERSION "1.0.0" #define DB_VERSION "1.0.0"
#define CKDB_VERSION DB_VERSION"-1.078" #define CKDB_VERSION DB_VERSION"-1.079"
#define WHERE_FFL " - from %s %s() line %d" #define WHERE_FFL " - from %s %s() line %d"
#define WHERE_FFL_HERE __FILE__, __func__, __LINE__ #define WHERE_FFL_HERE __FILE__, __func__, __LINE__

2
src/ckdb_data.c

@ -2383,7 +2383,7 @@ void set_block_share_counters()
{ {
K_TREE_CTX ctx[1], ctx_ms[1]; K_TREE_CTX ctx[1], ctx_ms[1];
K_ITEM *ss_item, ss_look, *ws_item, *wm_item, *ms_item, ms_look; K_ITEM *ss_item, ss_look, *ws_item, *wm_item, *ms_item, ms_look;
WORKERSTATUS *workerstatus; WORKERSTATUS *workerstatus = NULL;
SHARESUMMARY *sharesummary, looksharesummary; SHARESUMMARY *sharesummary, looksharesummary;
WORKMARKERS *workmarkers; WORKMARKERS *workmarkers;
MARKERSUMMARY *markersummary, lookmarkersummary; MARKERSUMMARY *markersummary, lookmarkersummary;

4
src/ckdb_dbio.c

@ -3436,7 +3436,7 @@ bool sharesummaries_to_markersummaries(PGconn *conn, WORKMARKERS *workmarkers,
PGresult *res; PGresult *res;
K_TREE_CTX ss_ctx[1], ms_ctx[1]; K_TREE_CTX ss_ctx[1], ms_ctx[1];
SHARESUMMARY *sharesummary, looksharesummary; SHARESUMMARY *sharesummary, looksharesummary;
MARKERSUMMARY *markersummary, lookmarkersummary, *p_markersummary; MARKERSUMMARY *markersummary, lookmarkersummary, *p_markersummary = NULL;
K_ITEM *ss_item, *ss_prev, ss_look, *ms_item, ms_look; K_ITEM *ss_item, *ss_prev, ss_look, *ms_item, ms_look;
K_ITEM *p_ss_item, *p_ms_item; K_ITEM *p_ss_item, *p_ms_item;
bool ok = false, conned = false; bool ok = false, conned = false;
@ -3865,7 +3865,7 @@ bool _sharesummary_update(PGconn *conn, SHARES *s_row, SHAREERRORS *e_row, K_ITE
PGresult *res = NULL; PGresult *res = NULL;
WORKMARKERS *wm; WORKMARKERS *wm;
SHARESUMMARY *row, *p_row; SHARESUMMARY *row, *p_row;
K_ITEM *item, *wm_item, *p_item; K_ITEM *item, *wm_item, *p_item = NULL;
char *ins, *upd; char *ins, *upd;
bool ok = false, new = false, p_new = false; bool ok = false, new = false, p_new = false;
char *params[19 + MODIFYDATECOUNT]; char *params[19 + MODIFYDATECOUNT];

Loading…
Cancel
Save