# HG changeset patch # User Matti Hamalainen # Date 1424966474 -7200 # Node ID 698ee83bac98aa8a5236e07c9adc035acc61f996 # Parent 5ac8f55139783ebc6f55075d21121d3558605d6b Constify & cleanup. diff -r 5ac8f5513978 -r 698ee83bac98 minijss/jssmod.c --- a/minijss/jssmod.c Thu Feb 26 15:58:04 2015 +0200 +++ b/minijss/jssmod.c Thu Feb 26 18:01:14 2015 +0200 @@ -8,21 +8,23 @@ #ifndef JSS_LIGHT -/* Take given data until maxlen reached, make a string + +/* Take given data until maxlen reached, make a string. + * Basically a bit like strndup(), except end marker byte + * can be specified. */ -char *jssASCIItoStr(char * sdata, const char endByte, const size_t maxLen) +char *jssASCIItoStr(const char * src, const char endByte, const size_t len) { size_t i, k; char *res; - for (i = 0; sdata[i] && i < maxLen; i++); + for (i = 0; src[i] && i < len; i++); - res = (char *) dmMalloc(i + 1); - if (res == NULL) + if ((res = dmMalloc(i + 1)) == NULL) return NULL; - for (k = 0; sdata[k] != endByte && k < i; k++) - res[k] = sdata[k]; + for (k = 0; src[k] != endByte && k < i; k++) + res[k] = src[k]; res[k] = 0; diff -r 5ac8f5513978 -r 698ee83bac98 minijss/jssmod.h --- a/minijss/jssmod.h Thu Feb 26 15:58:04 2015 +0200 +++ b/minijss/jssmod.h Thu Feb 26 18:01:14 2015 +0200 @@ -288,7 +288,7 @@ #endif #ifndef JSS_LIGHT -char* jssASCIItoStr(char *, const char, const size_t); +char * jssASCIItoStr(const char *src, const char endByte, const size_t len); BOOL jssEncodeSample8(Uint8 *, const size_t, const int); BOOL jssEncodeSample16(Uint16 *, const size_t, const int); #endif