Browse Source

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

master
Con Kolivas 9 years ago
parent
commit
3a51ff8716
  1. 2
      src/ckdb.h
  2. 2
      src/ckdb_data.c
  3. 10
      src/ckdb_dbio.c

2
src/ckdb.h

@ -51,7 +51,7 @@
#define DB_VLOCK "1"
#define DB_VERSION "1.0.4"
#define CKDB_VERSION DB_VERSION"-1.910"
#define CKDB_VERSION DB_VERSION"-1.911"
#define WHERE_FFL " - from %s %s() line %d"
#define WHERE_FFL_HERE __FILE__, __func__, __LINE__

2
src/ckdb_data.c

@ -4622,7 +4622,7 @@ static bool gen_workmarkers(PGconn *conn, MARKS *stt, bool after, MARKS *fin,
{
K_ITEM look, *wi_stt_item, *wi_fin_item, *old_wm_item;
WORKMARKERS *old_wm;
WORKINFO workinfo, *wi_stt = NULL, *wi_fin;
WORKINFO workinfo, *wi_stt = NULL, *wi_fin = NULL;
K_TREE_CTX ctx[1];
char description[TXT_BIG+1];
bool ok;

10
src/ckdb_dbio.c

@ -1585,7 +1585,7 @@ bool workers_fill(PGconn *conn)
{
ExecStatusType rescode;
PGresult *res;
K_ITEM *item;
K_ITEM *item = NULL;
int n, t, i;
WORKERS *row;
char *field;
@ -2220,7 +2220,7 @@ bool payments_fill(PGconn *conn)
{
ExecStatusType rescode;
PGresult *res;
K_ITEM *item;
K_ITEM *item = NULL;
PAYMENTS *row;
int n, t, i;
char *field;
@ -2880,7 +2880,7 @@ bool workinfo_fill(PGconn *conn)
char ndiffbin[TXT_SML+1];
ExecStatusType rescode;
PGresult *res;
K_ITEM *item;
K_ITEM *item = NULL;
WORKINFO *row;
char *params[3];
int n, t, i, par = 0;
@ -5437,7 +5437,7 @@ bool miningpayouts_fill(PGconn *conn)
{
ExecStatusType rescode;
PGresult *res;
K_ITEM *item;
K_ITEM *item = NULL;
MININGPAYOUTS *row;
int n, t, i;
char *field;
@ -6767,7 +6767,7 @@ bool markersummary_fill(PGconn *conn)
{
ExecStatusType rescode;
PGresult *res;
K_ITEM *item, *p_item;
K_ITEM *item = NULL, *p_item;
int n, t, i, p_n;
MARKERSUMMARY *row, *p_row;
char *params[1];

Loading…
Cancel
Save