Overview
| Comment: | Fix compilation with GCC |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
327ce49bc3cd8a0c8b8fc74144f94f46 |
| User & Date: | js on 2017-08-11 22:15:40 |
| Other Links: | manifest | tags |
Context
|
2017-08-11
| ||
| 22:26 | Always have retain / copy before nonatomic (check-in: 9db36c14b5 user: js tags: trunk) | |
| 22:15 | Fix compilation with GCC (check-in: 327ce49bc3 user: js tags: trunk) | |
| 21:02 | OFTimer: Keep the original interval on overrun (check-in: 1164147eec user: js tags: trunk) | |
Changes
Modified src/OFMutableTarArchiveEntry.m from [ee2d882217] to [51881174be].
| ︙ | ︙ | |||
13 14 15 16 17 18 19 20 21 22 23 24 25 26 |
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFMutableTarArchiveEntry.h"
@implementation OFMutableTarArchiveEntry
@dynamic fileName, mode, UID, GID, size, modificationDate, type, targetFileName;
@dynamic owner, group, deviceMajor, deviceMinor;
- copy
{
| > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 |
* LICENSE.GPLv2 or LICENSE.GPLv3 respectively included in the packaging of this
* file.
*/
#include "config.h"
#import "OFMutableTarArchiveEntry.h"
#import "OFString.h"
#import "OFDate.h"
@implementation OFMutableTarArchiveEntry
@dynamic fileName, mode, UID, GID, size, modificationDate, type, targetFileName;
@dynamic owner, group, deviceMajor, deviceMinor;
- copy
{
|
| ︙ | ︙ |
Modified src/OFTarArchiveEntry.h from [c4bac08a0d] to [efae6bf13b].
| ︙ | ︙ | |||
59 60 61 62 63 64 65 | OFString *_owner, *_group; uint32_t _deviceMajor, _deviceMinor; } /*! * The file name of the entry. */ | | | 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | OFString *_owner, *_group; uint32_t _deviceMajor, _deviceMinor; } /*! * The file name of the entry. */ @property (readonly, nonatomic, copy) OFString *fileName; /*! * The mode of the entry. */ @property (readonly, nonatomic) uint16_t mode; /*! |
| ︙ | ︙ | |||
84 85 86 87 88 89 90 | * The size of the file. */ @property (readonly, nonatomic) uint64_t size; /*! * The date of the last modification of the file. */ | | | > | | | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 |
* The size of the file.
*/
@property (readonly, nonatomic) uint64_t size;
/*!
* The date of the last modification of the file.
*/
@property (readonly, nonatomic, retain) OFDate *modificationDate;
/*!
* The type of the archive entry.
*
* See @ref of_tar_archive_entry_type_t.
*/
@property (readonly, nonatomic) of_tar_archive_entry_type_t type;
/*!
* The file name of the target (for a hard link or symbolic link).
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy)
OFString *targetFileName;
/*!
* The owner of the file.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFString *owner;
/*!
* The group of the file.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFString *group;
/*!
* The device major (if the file is a device).
*/
@property (readonly, nonatomic) uint32_t deviceMajor;
/*!
|
| ︙ | ︙ |
Modified src/OFZIPArchiveEntry.h from [64f6fec60c] to [041b085f1d].
| ︙ | ︙ | |||
102 103 104 105 106 107 108 | uint32_t _versionSpecificAttributes; int64_t _localFileHeaderOffset; } /*! * The file name of the entry. */ | | | > | | 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 |
uint32_t _versionSpecificAttributes;
int64_t _localFileHeaderOffset;
}
/*!
* The file name of the entry.
*/
@property (readonly, nonatomic, copy) OFString *fileName;
/*!
* The comment of the entry's file.
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy)
OFString *fileComment;
/*!
* The extra field of the entry.
*
* The item size *must* be 1!
*/
@property OF_NULLABLE_PROPERTY (readonly, nonatomic, copy) OFData *extraField;
/*!
* The version which made the entry.
*
* The lower 8 bits are the ZIP specification version.@n
* The upper 8 bits are the attribute compatibility.
* See @ref of_zip_archive_entry_attribute_compatibility.
|
| ︙ | ︙ | |||
139 140 141 142 143 144 145 | @property (readonly, nonatomic) uint16_t minVersionNeeded; /*! * The last modification date of the entry's file. * * @note Due to limitations of the ZIP format, this has only 2 second precision. */ | | | 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 | @property (readonly, nonatomic) uint16_t minVersionNeeded; /*! * The last modification date of the entry's file. * * @note Due to limitations of the ZIP format, this has only 2 second precision. */ @property (readonly, nonatomic, retain) OFDate *modificationDate; /*! * The compression method of the entry. * * Supported values are: * Value | Description * --------------------------------------------------|--------------- |
| ︙ | ︙ |