Overview
Comment: | Add +[dateWith(Local)DateString:format:]. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
42cd6eebb49f35652227466c8d543894 |
User & Date: | js on 2011-09-13 19:34:23 |
Other Links: | manifest | tags |
Context
2011-09-14
| ||
23:28 | Add -[tryReadLine] to OFStream. check-in: 6e8023786a user: js tags: trunk | |
2011-09-13
| ||
19:34 | Add +[dateWith(Local)DateString:format:]. check-in: 42cd6eebb4 user: js tags: trunk | |
11:06 | Update buildsys. check-in: f04c492302 user: js tags: trunk | |
Changes
Modified src/OFDate.h from [089a2d86d4] to [39d0390269].
︙ | ︙ | |||
70 71 72 73 74 75 76 77 78 79 80 81 82 83 | * \param seconds The seconds since now * \param microseconds The microsecond part of the time * \return A new, autoreleased OFDate with the specified date and time */ + dateWithTimeIntervalSinceNow: (int64_t)seconds microseconds: (uint32_t)microseconds; /** * \brief Returns a date in the distant future. * * The date is system-dependant. * * \return A date in the distant future */ | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 70 71 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 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 | * \param seconds The seconds since now * \param microseconds The microsecond part of the time * \return A new, autoreleased OFDate with the specified date and time */ + dateWithTimeIntervalSinceNow: (int64_t)seconds microseconds: (uint32_t)microseconds; /** * \brief Creates a new OFDate with the specified string in the specified * format. * * The time zone used is UTC. If a time zone is specified anyway, an * OFInvalidFormatException is thrown. See +[dateWithLocalDateString:format:] * if you want to specify a time zone. * * See the manpage for strptime for information on the format. * * \param string The string describing the date * \param format The format of the string describing the date * \return A new, autoreleased OFDate with the specified date and time */ + dateWithDateString: (OFString*)string format: (OFString*)format; /** * \brief Creates a new OFDate with the specified string in the specified * format. * * If no time zone is specified, local time is assumed. * * See the manpage for strptime for information on the format. * * \param string The string describing the date * \param format The format of the string describing the date * \return A new, autoreleased OFDate with the specified date and time */ + dateWithLocalDateString: (OFString*)string format: (OFString*)format; /** * \brief Returns a date in the distant future. * * The date is system-dependant. * * \return A date in the distant future */ |
︙ | ︙ | |||
113 114 115 116 117 118 119 | microseconds: (uint32_t)microseconds; /** * \brief Initializes an already allocated OFDate with the specified date and * time since now. * * \param seconds The seconds since now | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 145 146 147 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 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 | microseconds: (uint32_t)microseconds; /** * \brief Initializes an already allocated OFDate with the specified date and * time since now. * * \param seconds The seconds since now * \return An initialized OFDate with the specified date and time */ - initWithTimeIntervalSinceNow: (int64_t)seconds; /** * \brief Initializes an already allocated OFDate with the specified date and * time since now. * * \param seconds The seconds since now * \param microseconds The microsecond part of the time * \return An initialized OFDate with the specified date and time */ - initWithTimeIntervalSinceNow: (int64_t)seconds microseconds: (uint32_t)microseconds; /** * \brief Initializes an already allocated OFDate with the specified string in * the specified format. * * The time zone used is UTC. If a time zone is specified anyway, an * OFInvalidFormatException is thrown. See -[initWithLocalDateString:format:] * if you want to specify a time zone. * * See the manpage for strptime for information on the format. * * \param string The string describing the date * \param format The format of the string describing the date * \return An initialized OFDate with the specified date and time */ - initWithDateString: (OFString*)string format: (OFString*)format; /** * \brief Initializes an already allocated OFDate with the specified string in * the specified format. * * If no time zone is specified, local time is assumed. * * See the manpage for strptime for information on the format. * * \param string The string describing the date * \param format The format of the string describing the date * \return An initialized OFDate with the specified date and time */ - initWithLocalDateString: (OFString*)string format: (OFString*)format; /** * \brief Returns the microsecond of the date. * * \return The microsecond of the date */ - (uint32_t)microsecond; |
︙ | ︙ |
Modified src/OFDate.m from [0832a97340] to [0ba7e710c0].
︙ | ︙ | |||
29 30 31 32 33 34 35 36 37 38 39 40 41 42 | #import "OFAutoreleasePool.h" #ifdef OF_THREADS # import "OFThread.h" #endif #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFOutOfRangeException.h" #import "macros.h" #if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \ defined(OF_THREADS) static OFMutex *mutex; | > | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | #import "OFAutoreleasePool.h" #ifdef OF_THREADS # import "OFThread.h" #endif #import "OFInitializationFailedException.h" #import "OFInvalidArgumentException.h" #import "OFInvalidFormatException.h" #import "OFOutOfRangeException.h" #import "macros.h" #if (!defined(HAVE_GMTIME_R) || !defined(HAVE_LOCALTIME_R)) && \ defined(OF_THREADS) static OFMutex *mutex; |
︙ | ︙ | |||
165 166 167 168 169 170 171 172 173 174 175 176 177 178 | + dateWithTimeIntervalSinceNow: (int64_t)seconds microseconds: (uint32_t)microseconds { return [[[self alloc] initWithTimeIntervalSinceNow: seconds microseconds: microseconds] autorelease]; } + distantFuture { if (sizeof(time_t) == sizeof(int64_t)) return [[[self alloc] initWithTimeIntervalSince1970: INT64_MAX microseconds: 999999] autorelease]; | > > > > > > > > > > > > > > | 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 191 192 193 | + dateWithTimeIntervalSinceNow: (int64_t)seconds microseconds: (uint32_t)microseconds { return [[[self alloc] initWithTimeIntervalSinceNow: seconds microseconds: microseconds] autorelease]; } + dateWithDateString: (OFString*)string format: (OFString*)format { return [[[self alloc] initWithDateString: string format: format] autorelease]; } + dateWithLocalDateString: (OFString*)string format: (OFString*)format { return [[[self alloc] initWithLocalDateString: string format: format] autorelease]; } + distantFuture { if (sizeof(time_t) == sizeof(int64_t)) return [[[self alloc] initWithTimeIntervalSince1970: INT64_MAX microseconds: 999999] autorelease]; |
︙ | ︙ | |||
236 237 238 239 240 241 242 243 244 245 246 247 248 249 | self = [self init]; seconds += seconds_; microseconds += microseconds_; seconds += microseconds / 1000000; microseconds %= 1000000; return self; } - initWithSerialization: (OFXMLElement*)element { self = [super init]; | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 | self = [self init]; seconds += seconds_; microseconds += microseconds_; seconds += microseconds / 1000000; microseconds %= 1000000; return self; } - initWithDateString: (OFString*)string format: (OFString*)format { self = [super init]; @try { struct tm tm = {}; tm.tm_isdst = -1; if (strptime([string UTF8String], [format UTF8String], &tm) == NULL) @throw [OFInvalidFormatException newWithClass: isa]; if (tm.tm_gmtoff) @throw [OFInvalidFormatException newWithClass: isa]; if ((seconds = mktime(&tm)) == -1) @throw [OFInvalidFormatException newWithClass: isa]; seconds += tm.tm_gmtoff; } @catch (id e) { [self release]; @throw e; } return self; } - initWithLocalDateString: (OFString*)string format: (OFString*)format { self = [super init]; @try { struct tm tm = {}; tm.tm_isdst = -1; if (strptime([string UTF8String], [format UTF8String], &tm) == NULL) @throw [OFInvalidFormatException newWithClass: isa]; if ((seconds = mktime(&tm)) == -1) @throw [OFInvalidFormatException newWithClass: isa]; } @catch (id e) { [self release]; @throw e; } return self; } - initWithSerialization: (OFXMLElement*)element { self = [super init]; |
︙ | ︙ |