Commit ee8609d9a9ec3ec14f1514e6732b7ff9ab7e79f7
2012-11-29T12:48:17
Provide helper functions calloc_str and realloc_strcat to create and extend arbitrary length arrays based on string length.
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
diff --git a/util.c b/util.c
index a8e38cb..1dbeb0d 100644
--- a/util.c
+++ b/util.c
@@ -1477,3 +1477,44 @@ 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)
+{
+ 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");
+out:
+ return ptr;
+}
+
+/* Realloc an existing string to fit an extra string s, appending s to it. */
+void *realloc_strcat(char *ptr, char *s)
+{
+ size_t old = strlen(ptr), len = strlen(s);
+ char *ret;
+
+ if (!len)
+ return ptr;
+
+ len += old + 1;
+ if (len % 4)
+ len += 4 - (len % 4);
+
+ ret = malloc(len);
+ if (unlikely(!ret))
+ quit(1, "Failed to malloc in realloc_strcat");
+
+ sprintf(ret, "%s%s", ptr, s);
+ free(ptr);
+ return ret;
+}
diff --git a/util.h b/util.h
index 61dc668..cb41f6c 100644
--- a/util.h
+++ b/util.h
@@ -52,5 +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 *realloc_strcat(char *ptr, char *s);
#endif /* __UTIL_H__ */