@@ -29,11 +29,11 @@ @implementation OFString (XMLEscaping) - (OFString*)stringByXMLEscaping { char *retCString; const char *append; - size_t retLength, appendLength; + size_t retLength, appendLen; size_t i, j; OFString *ret; j = 0; retLength = length; @@ -47,48 +47,48 @@ for (i = 0; i < length; i++) { switch (string[i]) { case '<': append = "<"; - appendLength = 4; + appendLen = 4; break; case '>': append = ">"; - appendLength = 4; + appendLen = 4; break; case '"': append = """; - appendLength = 6; + appendLen = 6; break; case '\'': append = "'"; - appendLength = 6; + appendLen = 6; break; case '&': append = "&"; - appendLength = 5; + appendLen = 5; break; default: append = NULL; - appendLength = 0; + appendLen = 0; } if (append != NULL) { char *newRetCString; if ((newRetCString = realloc(retCString, - retLength + appendLength)) == NULL) { + retLength + appendLen)) == NULL) { free(retCString); @throw [OFOutOfMemoryException newWithClass: isa - requestedSize: retLength + appendLength]; + requestedSize: retLength + appendLen]; } retCString = newRetCString; - retLength += appendLength - 1; + retLength += appendLen - 1; - memcpy(retCString + j, append, appendLength); - j += appendLength; + memcpy(retCString + j, append, appendLen); + j += appendLen; } else retCString[j++] = string[i]; } assert(j == retLength);