diff --git a/@ 6a00763 b/@ 6a00763
diff --git a/@ 6a00763 b/@ 6a00763
diff --git a/@ 6a00763 b/@ 6a00763
diff --git a/@ 6a00763 b/@ 6a00763
@@ -50,8 +50,8 @@ HEDLEY_NON_NULL(3)
50	50		size_t* bytearray_find(const Bytearray* haystack, const void* needle, int (cmp)(const void, const void*));
51	51
52	52		#define new_bytearray(element_size) bytearray_with_capacity(BYTEARRAY_DEFAULT_SIZE, element_size)
53		-	#define bytearray_pop(bytearray, retptr) bytearray_pop_at(bytearray, ((Vector*)vector)->length-1, retptr)
54		-	#define bytearray_push(bytearray, item) bytearray_insert(bytearray, ((Vector*)vector)->length, item)
	53	+	#define bytearray_pop(bytearray, retptr) bytearray_pop_at(bytearray, ((Bytearray*)bytearray)->length-1, retptr)
	54	+	#define bytearray_push(bytearray, item) bytearray_insert(bytearray, ((Bytearray*)bytearray)->length, item)
55	55
56	56		#endif /* CUTILS_BYTE_ARRAY_H */
57	57
@@ -14,10 +14,10 @@
14	14		int cutil_strcasecmp(const char* s1, const char* s2);
15	15		int cutil_strncasecmp(const char* s1, const char* s2, size_t n);
16	16
17		-	size_t cutil_strnlen(const char *s, size_t maxlen);
	17	+	size_t cutil_strnlen(const char* s, size_t maxlen);
18	18
19		-	char* cutil_strdup(const char *s);
20		-	char* cutil_strndup(const char *s, size_t n);
	19	+	#define cutil_strdup(s) cutil_strndup(s, strlen((const char*)s))
	20	+	char* cutil_strndup(const char* s, size_t n);
21	21
22	22		bool cutil_memmem(const void* haystack, size_t haystacklen, const void* needle, size_t needlelen, size_t* pos);
23	23
@@ -29,6 +29,15 @@ typedef unsigned long ulong;
29	29		typedef unsigned long long ullong;
30	30		#endif /* CUTILS_NO_SHORTHANDLES */
31	31
	32	+	#ifndef CUTILS_NO_MACROS
	33	+	#define MAX(x,y) ((x) > (y) ? (x) : (y))
	34	+	#define MIN(x,y) ((x) < (y) ? (x) : (y))
	35	+	#define LOOP while(1)
	36	+	#define RANGE(i, start, end) \
	37	+	for(((i) = (start)); ((start) < (end)) ? ((i) < (end)) : ((i) > (end)); ((start) < (end)) ? (i++) : (i--))
	38	+	#endif /* CUTILS_NO_MACROS */
	39	+
	40	+
32	41		#if __STDC_VERSION__ >= 199901L
33	42		#ifdef UINT32_MAX
34	43		uint32_t nethost32(uint32_t const net);
@@ -39,7 +39,7 @@ int cutil_strncasecmp(const char* s1, const char* s2, size_t n)
39	39		return c1 - c2;
40	40		}
41	41
42		-	size_t cutil_strnlen(const char *s, size_t maxlen)
	42	+	size_t cutil_strnlen(const char* s, size_t maxlen)
43	43		{
44	44		size_t len;
45	45
@@ -51,23 +51,12 @@ size_t cutil_strnlen(const char *s, size_t maxlen)
51	51		return (len);
52	52		}
53	53
54		-	char* cutil_strdup(const char *s)
55		-	{
56		-	char* ret;
57		-	size_t len = strlen(s);
58		-
59		-	ret = malloc(len+1);
60		-	memcpy(ret, s, len+1);
61		-
62		-	return ret;
63		-	}
64		-
65		-	char* cutil_strndup(const char *s, size_t n)
	54	+	char* cutil_strndup(const char* s, size_t n)
66	55		{
67	56		char* ret;
68	57		size_t len = cutil_strnlen(s, n);
69	58
70		-	len = len <= n ? len : n;
	59	+	len = MIN(len, n);
71	60
72	61		ret = malloc(len+1);
73	62		memcpy(ret, s, len+1);
@@ -77,25 +66,22 @@ char* cutil_strndup(const char *s, size_t n)
77	66
78	67		bool cutil_memmem(const void* haystack, size_t haystacklen, const void* needle, size_t needlelen, size_t* pos)
79	68		{
80		-	size_t i, j, tmp;
	69	+	size_t i, j;
81	70		const byte* haystackb = haystack;
82	71		const byte* needleb = needle;
83	72
84	73
85		-	if (haystacklen == 0 \|\| needlelen == 0)
	74	+	if(HEDLEY_UNLIKELY(haystacklen == 0 \|\| needlelen == 0 \|\| haystacklen < needlelen))
86	75		return false;
87		-
	76	+	//TODO: use memchr as base search
88	77		for(i = 0; i < haystacklen; i++)
89	78		{
90		-	for(j = 0, tmp = i; j < needlelen && i < haystacklen; j++, i++)
	79	+	for(j = 0, *pos = i; j < needlelen && i < haystacklen; j++, i++)
91	80		{
92	81		if(haystackb[i] != needleb[j])
93		-	{
94	82		break;
95		-	} else if(j == needlelen-1){
96		-	*pos = tmp;
	83	+	else if(j == needlelen-1)
97	84		return true;
98		-	}
99	85		}
100	86		}
101	87
@@ -115,6 +101,9 @@ int cutil_asprintf(char** strp, const char* format, ...)
115	101
116	102		*strp = malloc(needed);
117	103
	104	+	if(!*strp)
	105	+	return -1;
	106	+
118	107		va_start(ap, format);
119	108		ret = snprintf(*strp, needed, format, ap);
120	109		va_end(ap);