Commit f94cff77e6158c7f759be6e61d55360c01bf0f07
2012-12-02T18:06:55
Microoptimise and remove redundant copy of strdup function in calloc_strcat.
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 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64
diff --git a/cgminer.c b/cgminer.c
index 09e2292..9412d26 100644
--- a/cgminer.c
+++ b/cgminer.c
@@ -2303,13 +2303,11 @@ static bool submit_upstream_work(struct work *work, CURL *curl, bool resubmit)
/* build JSON-RPC request */
if (work->gbt) {
- char *gbt_block, *varint, *header;
+ char *gbt_block, *varint;
unsigned char data[80];
flip80(data, work->data);
- header = bin2hex(data, 80);
- gbt_block = calloc_strcat(header);
- free(header);
+ gbt_block = bin2hex(data, 80);
if (work->gbt_txns < 0xfd) {
uint8_t val = work->gbt_txns;
diff --git a/util.c b/util.c
index 8f17955..82c0907 100644
--- a/util.c
+++ b/util.c
@@ -1478,27 +1478,6 @@ 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_strcat(char *s)
-{
- size_t len = strlen(s);
- void *ptr = NULL;
-
- if (!len)
- goto out;
-
- len += 1;
- if (len % 4)
- len += 4 - (len % 4);
- ptr = calloc(len, 1);
- if (unlikely(!ptr))
- quit(1, "Failed to calloc ptr in calloc_str");
-
- sprintf(ptr, "%s", s);
-out:
- return ptr;
-}
-
/* Realloc an existing string to fit an extra string s, appending s to it. */
void *realloc_strcat(char *ptr, char *s)
{
diff --git a/util.h b/util.h
index b28618c..8411dd3 100644
--- a/util.h
+++ b/util.h
@@ -52,7 +52,6 @@ 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_strcat(char *s);
void *realloc_strcat(char *ptr, char *s);
#endif /* __UTIL_H__ */