Overview
| Comment: | Make GCC happy again |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
139f041fa10ffab3c8483545c97b15b3 |
| User & Date: | js on 2023-07-24 18:20:22 |
| Other Links: | manifest | tags |
Context
|
2023-07-24
| ||
| 18:40 | OFZIPArchive: Restrict split archives to mode @"r" check-in: 79b88573e0 user: js tags: trunk | |
| 18:20 | Make GCC happy again check-in: 139f041fa1 user: js tags: trunk | |
|
2023-07-23
| ||
| 23:35 | OFZIPArchive: Initial support for split archives check-in: 630ea6bc5a user: js tags: trunk | |
Changes
Modified src/OFZIPArchive.m from [460801d892] to [a443071aae].
| ︙ | ︙ | |||
148 149 150 151 152 153 154 155 156 157 158 159 160 161 |
*size -= 8;
return field;
}
@implementation OFZIPArchive
@synthesize delegate = _delegate, archiveComment = _archiveComment;
+ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode
{
return [[[self alloc] initWithStream: stream mode: mode] autorelease];
}
+ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode
| > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 |
*size -= 8;
return field;
}
@implementation OFZIPArchive
@synthesize delegate = _delegate, archiveComment = _archiveComment;
static void
seekOrThrowInvalidFormat(OFZIPArchive *archive, const uint32_t *diskNumber,
OFStreamOffset offset, OFSeekWhence whence)
{
if (diskNumber != NULL && *diskNumber != archive->_diskNumber) {
OFStream *oldStream = archive->_stream;
OFSeekableStream *stream =
[archive->_delegate archive: archive
wantsPartNumbered: *diskNumber
totalNumberOfParts: archive->_numDisks];
if (stream == nil)
@throw [OFInvalidFormatException exception];
archive->_diskNumber = *diskNumber;
archive->_stream = [stream retain];
[oldStream release];
}
@try {
[archive->_stream seekToOffset: offset whence: whence];
} @catch (OFSeekFailedException *e) {
if (e.errNo == EINVAL)
@throw [OFInvalidFormatException exception];
@throw e;
}
}
+ (instancetype)archiveWithStream: (OFStream *)stream mode: (OFString *)mode
{
return [[[self alloc] initWithStream: stream mode: mode] autorelease];
}
+ (instancetype)archiveWithIRI: (OFIRI *)IRI mode: (OFString *)mode
|
| ︙ | ︙ | |||
251 252 253 254 255 256 257 | [_archiveComment release]; [_entries release]; [_pathToEntryMap release]; [super dealloc]; } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 280 281 282 283 284 285 286 287 288 289 290 291 292 293 |
[_archiveComment release];
[_entries release];
[_pathToEntryMap release];
[super dealloc];
}
- (void)of_readZIPInfo
{
void *pool = objc_autoreleasePoolPush();
uint16_t commentLength;
OFStreamOffset offset = -22;
bool valid = false;
|
| ︙ | ︙ |