Commit 0ae02c6ec4351d1def5f2cffa0e0a86290afab70
2012-12-01T08:26:31
Since we will be using calloc_str to put a string into it, convert the function to calloc_strcat which does it automatically.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49
diff --git a/cgminer.c b/cgminer.c
index cd2c12a..8cbc01e 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2308,8 +2308,7 @@ static bool submit_upstream_work(struct work *work, CURL *curl, bool resubmit)
flip80(data, work->data);
header = bin2hex(data, 80);
- gbt_block = calloc_str(header);
- sprintf(gbt_block, "%s", header);
+ gbt_block = calloc_strcat(header);
free(header);
if (work->gbt_txns < 0xfd) {
diff --git a/util.c b/util.c
index 1dbeb0d..8f17955 100644
--- a/util.c
+++ b/util.c
@@ -1479,7 +1479,7 @@ void dev_error(struct cgpu_info *dev, enum dev_reason reason)
}
/* Calloc enough memory to fit string s, rounding up to 4 byte alignment */
-void *calloc_str(char *s)
+void *calloc_strcat(char *s)
{
size_t len = strlen(s);
void *ptr = NULL;
@@ -1493,6 +1493,8 @@ void *calloc_str(char *s)
ptr = calloc(len, 1);
if (unlikely(!ptr))
quit(1, "Failed to calloc ptr in calloc_str");
+
+ sprintf(ptr, "%s", s);
out:
return ptr;
}
diff --git a/util.h b/util.h
index cb41f6c..b28618c 100644
--- a/util.h
+++ b/util.h
@@ -52,7 +52,7 @@ bool extract_sockaddr(struct pool *pool, char *url);
bool auth_stratum(struct pool *pool);
bool initiate_stratum(struct pool *pool);
void dev_error(struct cgpu_info *dev, enum dev_reason reason);
-void *calloc_str(char *s);
+void *calloc_strcat(char *s);
void *realloc_strcat(char *ptr, char *s);
#endif /* __UTIL_H__ */