Differences From Artifact [cd42320784]:
- File
src/of_asprintf.m
— part of check-in
[ecca609079]
at
2020-05-16 17:17:52
on branch trunk
— Don't use %I on Windows
Older versions only understand I64. So only use I64 where appropriate
and drop it entirely where not. (user: js, size: 16873) [annotate] [blame] [check-ins using] [more...]
To Artifact [d2e16772ed]:
- File src/of_asprintf.m — part of check-in [07f4a82038] at 2021-01-31 15:16:36 on branch trunk — of_asprintf: Fix type mismatch on LP64 systems (user: js, size: 16629) [annotate] [blame] [check-ins using] [more...]
1 | /* | < < | | 1 2 3 4 5 6 7 8 9 | /* * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im> * * All rights reserved. * * This file is part of ObjFW. It may be distributed under the terms of the * Q Public License 1.0, which can be found in the file LICENSE.QPL included in * the packaging of this file. * |
| ︙ | ︙ | |||
95 96 97 98 99 100 101 |
}
#endif
#ifndef HAVE_ASPRINTF
static int
vasprintf(char **string, const char *format, va_list arguments)
{
| | | | < | | < < < < | | | | > > | > | < | | > > | < < < | | > | | 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 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 |
}
#endif
#ifndef HAVE_ASPRINTF
static int
vasprintf(char **string, const char *format, va_list arguments)
{
int length;
size_t bufferLength = 128;
*string = NULL;
for (;;) {
free(*string);
if ((*string = malloc(bufferLength)) == NULL)
return -1;
length = vsnprintf(*string, bufferLength - 1, format,
arguments);
if (length >= 0 && (size_t)length < bufferLength - 1)
break;
if (bufferLength > INT_MAX / 2) {
free(*string);
return -1;
}
bufferLength <<= 1;
}
if (length > 0 && (size_t)length != bufferLength - 1) {
char *resized = realloc(*string, length + 1);
/* Ignore if making it smaller failed. */
if (resized != NULL)
*string = resized;
}
return length;
}
static int
|
| ︙ | ︙ | |||
289 290 291 292 293 294 295 | } break; case 'j': #if defined(OF_WINDOWS) if (!appendSubformat(ctx, "I64", 3)) return false; | | | | | 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 318 319 320 321 322 323 324 325 326 327 328 329 330 | } break; case 'j': #if defined(OF_WINDOWS) if (!appendSubformat(ctx, "I64", 3)) return false; #elif defined(_NEWLIB_VERSION) || defined(OF_HPUX) if (!appendSubformat(ctx, "ll", 2)) return false; #else if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; #endif ctx->lengthModifier = LENGTH_MODIFIER_J; break; case 'z': #if defined(OF_WINDOWS) if (sizeof(size_t) == 8) if (!appendSubformat(ctx, "I64", 3)) return false; #elif defined(_NEWLIB_VERSION) || defined(OF_HPUX) if (!appendSubformat(ctx, "l", 1)) return false; #else if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; #endif ctx->lengthModifier = LENGTH_MODIFIER_Z; break; case 't': #if defined(OF_WINDOWS) if (sizeof(ptrdiff_t) == 8) if (!appendSubformat(ctx, "I64", 3)) return false; #elif defined(_NEWLIB_VERSION) || defined(OF_HPUX) if (!appendSubformat(ctx, "l", 1)) return false; #else if (!appendSubformat(ctx, ctx->format + ctx->i, 1)) return false; #endif |
| ︙ | ︙ |