From 41af7e2b7bcebbe43aeffdc60c8ea4dc43fb8491 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Tue, 2 Sep 2014 17:06:01 +0000 Subject: [PATCH] Remove unused blktemplate_t fields (breaks ABI) --- blkmaker.c | 3 --- blktemplate.c | 3 --- blktemplate.h | 6 ------ 3 files changed, 12 deletions(-) diff --git a/blkmaker.c b/blkmaker.c index 48092a0..7bc1421 100644 --- a/blkmaker.c +++ b/blkmaker.c @@ -383,9 +383,6 @@ size_t blkmk_get_data(blktemplate_t *tmpl, void *buf, size_t bufsz, time_t useti return 0; blkmk_set_times(tmpl, &cbuf[68], usetime, out_expire, false); - // TEMPORARY HACK: - memcpy(tmpl->_mrklroot, &cbuf[36], 32); - return 76; } diff --git a/blktemplate.c b/blktemplate.c index 457bae7..197ff17 100644 --- a/blktemplate.c +++ b/blktemplate.c @@ -117,9 +117,6 @@ void blktmpl_free(blktemplate_t *tmpl) { free(tmpl->cbtxn); } free(tmpl->_mrklbranch); - // TODO: maybe free auxnames[0..n]? auxdata too - free(tmpl->auxnames); - free(tmpl->auxdata); for (unsigned i = 0; i < tmpl->aux_count; ++i) blkaux_clean(&tmpl->auxs[i]); free(tmpl->auxs); diff --git a/blktemplate.h b/blktemplate.h index 5efa089..bc79cd4 100644 --- a/blktemplate.h +++ b/blktemplate.h @@ -108,11 +108,6 @@ typedef struct { time_t _time_rcvd; blktime_t curtime; - // NOTE: These were never populated nor used, see aux_count and auxs - char auxcount; - char **auxnames; - unsigned char **auxdata; - char *workid; // BIP 22: Long Polling @@ -135,7 +130,6 @@ typedef struct { // TEMPORARY HACK libblkmaker_hash_t *_mrklbranch; int _mrklbranchcount; - libblkmaker_hash_t _mrklroot; unsigned int next_dataid; unsigned aux_count;