GOSTSec/sgminer
1
0
Fork 0
mirror of https://github.com/GOSTSec/sgminer synced 2025-01-22 20:44:19 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into usb-dev

Browse Source
This commit is contained in:
Con Kolivas 2013-02-10 13:29:25 +11:00
commit c28e2238c6
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cgminer.c
View File

@ -2999,8 +2999,13 @@ static void roll_work(struct work *work)
* prevent a copied work struct from freeing ram belonging to another struct */ * prevent a copied work struct from freeing ram belonging to another struct */
void __copy_work(struct work *work, struct work *base_work) void __copy_work(struct work *work, struct work *base_work)
{ {
int id = work->id;
clean_work(work); clean_work(work);
memcpy(work, base_work, sizeof(struct work)); memcpy(work, base_work, sizeof(struct work));
/* Keep the unique new id assigned during make_work to prevent copied
* work from having the same id. */
work->id = id;
if (base_work->job_id) if (base_work->job_id)
work->job_id = strdup(base_work->job_id); work->job_id = strdup(base_work->job_id);
if (base_work->nonce2) if (base_work->nonce2)
@ -3017,7 +3022,7 @@ struct work *copy_work(struct work *base_work)
{ {
struct work *work = make_work(); struct work *work = make_work();
__copy_work(work, base_work); __copy_work(work, base_work);
return work; return work;
} }