Overview
Comment: | OFStrdup -> OFStrDup and slightly change behavior |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
fd51df70228dc87c55e9214cd2f66b07 |
User & Date: | js on 2021-04-25 19:41:20 |
Other Links: | manifest | tags |
Context
2021-04-25
| ||
19:58 | Last round of renames (hopefully) check-in: 6ae98c1dcf user: js tags: trunk | |
19:41 | OFStrdup -> OFStrDup and slightly change behavior check-in: fd51df7022 user: js tags: trunk | |
16:48 | Make OFListItem opaque check-in: 8573ef86c6 user: js tags: trunk | |
Changes
Modified src/OFHTTPServer.m from [77f28b39f4] to [40f5819df6].
︙ | ︙ | |||
115 116 117 118 119 120 121 | - (void)stop; @end #endif static OF_INLINE OFString * normalizedKey(OFString *key) { | | < < < < | 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 | - (void)stop; @end #endif static OF_INLINE OFString * normalizedKey(OFString *key) { char *cString = OFStrDup(key.UTF8String); unsigned char *tmp = (unsigned char *)cString; bool firstLetter = true; while (*tmp != '\0') { if (!OFASCIIIsAlpha(*tmp)) { firstLetter = true; tmp++; continue; } |
︙ | ︙ |
Modified src/OFLocale.m from [29cb16735c] to [54708bc402].
︙ | ︙ | |||
38 39 40 41 42 43 44 | static OFDictionary *operatorPrecedences = nil; #ifndef OF_AMIGAOS static void parseLocale(char *locale, OFStringEncoding *encoding, OFString **language, OFString **territory) { | | < | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 | static OFDictionary *operatorPrecedences = nil; #ifndef OF_AMIGAOS static void parseLocale(char *locale, OFStringEncoding *encoding, OFString **language, OFString **territory) { locale = OFStrDup(locale); @try { OFStringEncoding enc = OFStringEncodingASCII; char *tmp; /* We don't care for extras behind the @ */ if ((tmp = strrchr(locale, '@')) != NULL) |
︙ | ︙ |
Modified src/OFString.h from [068370b7c7] to [b4ac5f8ea5].
︙ | ︙ | |||
1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 | * @brief Returns the name of the specified OFStringEncoding. * * @param encoding The encoding for which to return the name * @return The name of the specified OFStringEncoding */ extern OFString *_Nullable OFStringEncodingName(OFStringEncoding encoding); extern size_t OFUTF8StringEncode(OFUnichar, char *); extern ssize_t OFUTF8StringDecode(const char *, size_t, OFUnichar *); extern size_t OFUTF16StringLength(const OFChar16 *); extern size_t OFUTF32StringLength(const OFChar32 *); #ifdef __cplusplus } #endif | > | 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 | * @brief Returns the name of the specified OFStringEncoding. * * @param encoding The encoding for which to return the name * @return The name of the specified OFStringEncoding */ extern OFString *_Nullable OFStringEncodingName(OFStringEncoding encoding); extern char *_Nullable OFStrDup(const char *_Nonnull); extern size_t OFUTF8StringEncode(OFUnichar, char *); extern ssize_t OFUTF8StringDecode(const char *, size_t, OFUnichar *); extern size_t OFUTF16StringLength(const OFChar16 *); extern size_t OFUTF32StringLength(const OFChar32 *); #ifdef __cplusplus } #endif |
︙ | ︙ |
Modified src/OFString.m from [91ec495f18] to [d4404e2d68].
︙ | ︙ | |||
333 334 335 336 337 338 339 340 341 342 343 344 345 346 | size_t length = 0; while (*string++ != 0) length++; return length; } #ifdef OF_HAVE_UNICODE_TABLES static OFString * decomposedString(OFString *self, const char *const *const *table, size_t size) { OFMutableString *ret = [OFMutableString string]; void *pool = objc_autoreleasePoolPush(); | > > > > > > > > > > | 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 | size_t length = 0; while (*string++ != 0) length++; return length; } char * OFStrDup(const char *string) { size_t length = strlen(string); char *copy = (char *)OFAllocMemory(1, length + 1); memcpy(copy, string, length + 1); return copy; } #ifdef OF_HAVE_UNICODE_TABLES static OFString * decomposedString(OFString *self, const char *const *const *table, size_t size) { OFMutableString *ret = [OFMutableString string]; void *pool = objc_autoreleasePoolPush(); |
︙ | ︙ |
Modified src/OFURL.m from [8f125e31a5] to [110acb1505].
︙ | ︙ | |||
438 439 440 441 442 443 444 | self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); char *tmp, *tmp2; bool isIPv6Host = false; | < < < < < | | 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 | self = [super init]; @try { void *pool = objc_autoreleasePoolPush(); char *tmp, *tmp2; bool isIPv6Host = false; UTF8String = UTF8String2 = OFStrDup(string.UTF8String); if ((tmp = strchr(UTF8String, ':')) == NULL) @throw [OFInvalidFormatException exception]; if (strncmp(tmp, "://", 3) != 0) @throw [OFInvalidFormatException exception]; |
︙ | ︙ | |||
629 630 631 632 633 634 635 | _URLEncodedScheme = [URL->_URLEncodedScheme copy]; _URLEncodedHost = [URL->_URLEncodedHost copy]; _port = [URL->_port copy]; _URLEncodedUser = [URL->_URLEncodedUser copy]; _URLEncodedPassword = [URL->_URLEncodedPassword copy]; | < < < < < | | 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 | _URLEncodedScheme = [URL->_URLEncodedScheme copy]; _URLEncodedHost = [URL->_URLEncodedHost copy]; _port = [URL->_port copy]; _URLEncodedUser = [URL->_URLEncodedUser copy]; _URLEncodedPassword = [URL->_URLEncodedPassword copy]; UTF8String = UTF8String2 = OFStrDup(string.UTF8String); if ((tmp = strchr(UTF8String, '#')) != NULL) { *tmp = '\0'; _URLEncodedFragment = [[OFString alloc] initWithUTF8String: tmp + 1]; OFURLVerifyIsEscaped(_URLEncodedFragment, |
︙ | ︙ |
Modified src/macros.h from [8f5f38092b] to [3a3771fba4].
︙ | ︙ | |||
694 695 696 697 698 699 700 | static OF_INLINE void OFBitsetClear(unsigned char *_Nonnull storage, size_t idx) { storage[idx / CHAR_BIT] &= ~(1u << (idx % CHAR_BIT)); } | < < < < < < < < < < < < < < | 694 695 696 697 698 699 700 701 702 703 704 705 706 707 | static OF_INLINE void OFBitsetClear(unsigned char *_Nonnull storage, size_t idx) { storage[idx / CHAR_BIT] &= ~(1u << (idx % CHAR_BIT)); } static OF_INLINE void OFZeroMemory(void *_Nonnull buffer_, size_t length) { volatile unsigned char *buffer = (volatile unsigned char *)buffer_; while (buffer < (unsigned char *)buffer_ + length) *buffer++ = '\0'; |
︙ | ︙ |
Modified src/runtime/misc.m from [0e07d705d4] to [3f2babee79].
︙ | ︙ | |||
127 128 129 130 131 132 133 | va_end(args); abort(); #endif OF_UNREACHABLE } | > > > > > > > > > > > > > > | 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 | va_end(args); abort(); #endif OF_UNREACHABLE } static char * objc_strdup(const char *string) { char *copy; size_t length = strlen(string); if ((copy = (char *)malloc(length + 1)) == NULL) return NULL; memcpy(copy, string, length + 1); return copy; } |
Modified src/runtime/private.h from [0007b0cada] to [13fad70e4b].
︙ | ︙ | |||
328 329 330 331 332 333 334 335 336 337 338 339 340 341 | extern void objc_global_mutex_unlock(void); extern void objc_global_mutex_free(void); #else # define objc_global_mutex_lock() # define objc_global_mutex_unlock() # define objc_global_mutex_free() #endif static inline IMP _Nullable objc_dtable_get(const struct objc_dtable *_Nonnull dtable, uint32_t idx) { #ifdef OF_SELUID24 uint8_t i = idx >> 16; uint8_t j = idx >> 8; | > | 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 | extern void objc_global_mutex_unlock(void); extern void objc_global_mutex_free(void); #else # define objc_global_mutex_lock() # define objc_global_mutex_unlock() # define objc_global_mutex_free() #endif extern char *_Nullable objc_strdup(const char *_Nonnull string); static inline IMP _Nullable objc_dtable_get(const struct objc_dtable *_Nonnull dtable, uint32_t idx) { #ifdef OF_SELUID24 uint8_t i = idx >> 16; uint8_t j = idx >> 8; |
︙ | ︙ |
Modified src/runtime/property.m from [3a98767011] to [34b7870e2a].
︙ | ︙ | |||
215 216 217 218 219 220 221 | bool nullIsError = false; if (strlen(name) != 1) return NULL; switch (*name) { case 'T': | | | | | 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 | bool nullIsError = false; if (strlen(name) != 1) return NULL; switch (*name) { case 'T': ret = objc_strdup(property->getter.typeEncoding); nullIsError = true; break; case 'G': if (property->attributes & OBJC_PROPERTY_GETTER) { ret = objc_strdup(property->getter.name); nullIsError = true; } break; case 'S': if (property->attributes & OBJC_PROPERTY_SETTER) { ret = objc_strdup(property->setter.name); nullIsError = true; } break; #define BOOL_CASE(name, field, flag) \ case name: \ if (property->field & flag) { \ ret = calloc(1, 1); \ |
︙ | ︙ |
Modified src/runtime/selector.m from [c3a8468168] to [7cee0dae00].
︙ | ︙ | |||
79 80 81 82 83 84 85 | objc_global_mutex_unlock(); return (SEL)selector; } if ((selector = malloc(sizeof(*selector))) == NULL) OBJC_ERROR("Not enough memory to allocate selector!"); | | | 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 | objc_global_mutex_unlock(); return (SEL)selector; } if ((selector = malloc(sizeof(*selector))) == NULL) OBJC_ERROR("Not enough memory to allocate selector!"); if ((selector->UID = (uintptr_t)objc_strdup(name)) == 0) OBJC_ERROR("Not enough memory to allocate selector!"); selector->typeEncoding = NULL; if ((freeList = realloc(freeList, sizeof(void *) * (freeListCount + 2))) == NULL) OBJC_ERROR("Not enough memory to allocate selector!"); |
︙ | ︙ |