# HG changeset patch # User Matti Hamalainen # Date 1206785286 -7200 # Node ID 2d7b190acc76e640fb84f90e19975063d789e6e5 # Parent 615b67c4e0102e5df98725488f370a653501b02c Indeed 'new' might not be a C keyword, but it's a C++ keyword and thus not recommended to be used as a identifier. diff -r 615b67c4e010 -r 2d7b190acc76 src/madplug/input.c --- a/src/madplug/input.c Sat Mar 29 12:06:38 2008 +0200 +++ b/src/madplug/input.c Sat Mar 29 12:08:06 2008 +0200 @@ -138,14 +138,14 @@ id3_ucs4_t * mad_ucs4dup(id3_ucs4_t *org) { - id3_ucs4_t *new = NULL; + id3_ucs4_t *res = NULL; size_t len = mad_ucs4len(org); - new = g_malloc0((len + 1) * sizeof(id3_ucs4_t)); - memcpy(new, org, len * sizeof(id3_ucs4_t)); - *(new + len) = 0; //terminate + res = g_malloc0((len + 1) * sizeof(id3_ucs4_t)); + memcpy(res, org, len * sizeof(id3_ucs4_t)); + *(res + len) = 0; //terminate - return new; + return res; } #define BYTES(x) ((x) * sizeof(id3_ucs4_t))