Mercurial > hg > dmlib
comparison minijss/jssmod.c @ 948:698ee83bac98
Constify & cleanup.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Thu, 26 Feb 2015 18:01:14 +0200 |
parents | b136ddc4070b |
children | e22d4ceb6414 |
comparison
equal
deleted
inserted
replaced
947:5ac8f5513978 | 948:698ee83bac98 |
---|---|
6 #include "jssmod.h" | 6 #include "jssmod.h" |
7 #include <string.h> | 7 #include <string.h> |
8 | 8 |
9 | 9 |
10 #ifndef JSS_LIGHT | 10 #ifndef JSS_LIGHT |
11 /* Take given data until maxlen reached, make a string | 11 |
12 */ | 12 /* Take given data until maxlen reached, make a string. |
13 char *jssASCIItoStr(char * sdata, const char endByte, const size_t maxLen) | 13 * Basically a bit like strndup(), except end marker byte |
14 * can be specified. | |
15 */ | |
16 char *jssASCIItoStr(const char * src, const char endByte, const size_t len) | |
14 { | 17 { |
15 size_t i, k; | 18 size_t i, k; |
16 char *res; | 19 char *res; |
17 | 20 |
18 for (i = 0; sdata[i] && i < maxLen; i++); | 21 for (i = 0; src[i] && i < len; i++); |
19 | 22 |
20 res = (char *) dmMalloc(i + 1); | 23 if ((res = dmMalloc(i + 1)) == NULL) |
21 if (res == NULL) | |
22 return NULL; | 24 return NULL; |
23 | 25 |
24 for (k = 0; sdata[k] != endByte && k < i; k++) | 26 for (k = 0; src[k] != endByte && k < i; k++) |
25 res[k] = sdata[k]; | 27 res[k] = src[k]; |
26 | 28 |
27 res[k] = 0; | 29 res[k] = 0; |
28 | 30 |
29 return res; | 31 return res; |
30 } | 32 } |