pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refined the string escaping algorithm.

Browse source
This commit is contained in:
Markus Kauppila 2011-07-18 17:16:38 +03:00
parent 6ab0dd4945
commit 8190ae317e
1 changed files with 22 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

56
test/test-automation/xml.c
View file

@ -148,9 +148,9 @@ EscapeString(const char *string)
break;
case '\'': totalSize += 6; //SDL_strlen("'");
break;
case '"': totalSize += 6; //SDL_strlen(""");
case '"': totalSize += 6; //SDL_strlen(""");
break;
case '<': totalSize += 4; //SDL_strlen("&lt;");
case '<': totalSize += 4; //SDL_strlen("&lt;");
break;
case '>': totalSize += 4; //SDL_strlen("&gt;");
break;
@ -167,53 +167,41 @@ EscapeString(const char *string)
}
// escape the string
int retBufferCounter = 0;
for(counter = 0; counter < maxCount; ++counter) {
char character = string[counter];
char *curRetBuffer = retBuffer;
char *curString = string;
char character = *curString;
while( (character = *curString++) ) {
switch(character) {
case '&':
retBuffer[retBufferCounter++] = '&';
retBuffer[retBufferCounter++] = 'a';
retBuffer[retBufferCounter++] = 'm';
retBuffer[retBufferCounter++] = 'p';
retBuffer[retBufferCounter++] = ';';
memcpy((void *)curRetBuffer, (void *)"&amp;", 5);
curRetBuffer += 5;
break;
case '\'':
retBuffer[retBufferCounter++] = '&';
retBuffer[retBufferCounter++] = 'a';
retBuffer[retBufferCounter++] = 'p';
retBuffer[retBufferCounter++] = 'o';
retBuffer[retBufferCounter++] = 's';
retBuffer[retBufferCounter++] = ';';
memcpy((void *)curRetBuffer, (void *)"&apos;", 6);
curRetBuffer += 6;
break;
case '"':
retBuffer[retBufferCounter++] = '&';
retBuffer[retBufferCounter++] = 'q';
retBuffer[retBufferCounter++] = 'u';
retBuffer[retBufferCounter++] = 'o';
retBuffer[retBufferCounter++] = 't';
retBuffer[retBufferCounter++] = ';';
memcpy((void *)curRetBuffer, (void *)"&quot;", 6);
curRetBuffer += 6;
break;
case '<':
retBuffer[retBufferCounter++] = '&';
retBuffer[retBufferCounter++] = 'l';
retBuffer[retBufferCounter++] = 't';
retBuffer[retBufferCounter++] = ';';
memcpy((void *)curRetBuffer, (void *)"&lt;", 4);
curRetBuffer += 4;
break;
case '>': totalSize += SDL_strlen("&gt;");
retBuffer[retBufferCounter++] = '&';
retBuffer[retBufferCounter++] = 'g';
retBuffer[retBufferCounter++] = 't';
retBuffer[retBufferCounter++] = ';';
case '>':
memcpy((void *)curRetBuffer, (void *)"&gt;", 4);
curRetBuffer += 4;
break;
default:
retBuffer[retBufferCounter++] = character;
*curRetBuffer = character;
curRetBuffer += 1;
break;
}
}
retBuffer[retBufferCounter] = '\0';
*curRetBuffer = '\0';
return retBuffer;
}