Differences From Artifact [196faf3bb5]:
- File
src/OFString+XMLUnescaping.m
— part of check-in
[13ee56edf3]
at
2014-06-21 21:43:43
on branch trunk
— Move all macros from OFObject.h to macros.h
This means that OFObject.h imports macros.h now, making it unnecessary
to manually import macros.h in almost every file. And while at it, also
import autorelease.h in OFObject.h, so that this doesn't need to be
manually imported in almost every file as well. (user: js, size: 4934) [annotate] [blame] [check-ins using]
To Artifact [966d2aeae2]:
- File
src/OFString+XMLUnescaping.m
— part of check-in
[b5c8b62533]
at
2014-07-06 11:04:57
on branch trunk
— OFString+*.m: Add a few missing autorelease pools
Those were only a problem if the user created its own OFString subclass,
as calls to -[UTF8String] could then create a new, autoreleased C
string. As OFString_UTF8 simply returns the internal C string, this
hasn't been a problem when not subclassing OFString. (user: js, size: 5017) [annotate] [blame] [check-ins using]
| ︙ | ︙ | |||
72 73 74 75 76 77 78 79 80 81 |
length: i];
}
static OFString*
parseEntities(OFString *self, id (*lookup)(void*, OFString*, OFString*),
void *context)
{
const char *string;
size_t i, last, length;
bool inEntity;
| > > > | > > < < | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 |
length: i];
}
static OFString*
parseEntities(OFString *self, id (*lookup)(void*, OFString*, OFString*),
void *context)
{
OFMutableString *ret;
void *pool;
const char *string;
size_t i, last, length;
bool inEntity;
ret = [OFMutableString string];
pool = objc_autoreleasePoolPush();
string = [self UTF8String];
length = [self UTF8StringLength];
last = 0;
inEntity = false;
for (i = 0; i < length; i++) {
if (!inEntity && string[i] == '&') {
[ret appendUTF8String: string + last
length: i - last];
|
| ︙ | ︙ | |||
165 166 167 168 169 170 171 172 173 174 175 176 177 178 |
if (inEntity)
@throw [OFInvalidFormatException exception];
[ret appendUTF8String: string + last
length: i - last];
[ret makeImmutable];
return ret;
}
static id
lookupUsingDelegate(void *context, OFString *self, OFString *entity)
{
| > > | 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 |
if (inEntity)
@throw [OFInvalidFormatException exception];
[ret appendUTF8String: string + last
length: i - last];
[ret makeImmutable];
objc_autoreleasePoolPop(pool);
return ret;
}
static id
lookupUsingDelegate(void *context, OFString *self, OFString *entity)
{
|
| ︙ | ︙ |