ObjFW  Diff

Differences From Artifact [bdf6534c80]:

To Artifact [f0147f7049]:


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
137
138
139
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







-
+
-

-
+

-
-
-
+
+
-
-
-
-

-
-
+
+

-
-
+
+

+
+
-
-
+
+
+
-
-
-
+
+

+
+
-
+
-
-
-
-
-
+
+

+
-
+







}
#endif

#ifndef HAVE_ASPRINTF
static int
vasprintf(char **string, const char *format, va_list arguments)
{
	int expectedLength, length;
	size_t length, bufferLength = 128;
	va_list argumentsCopy;

	va_copy(argumentsCopy, arguments);
	*string = NULL;

	expectedLength = vsnprintf(NULL, 0, format, argumentsCopy);
	if (expectedLength == -1)
		/*
	for (;;) {
		free(*string);
		 * We have no way to know how large it is. Let's try 64 KB and
		 * hope.
		 */
		expectedLength = 65535;

	if ((*string = malloc((size_t)expectedLength + 1)) == NULL)
		return -1;
		if ((*string = malloc(bufferLength)) == NULL)
			return -1;

	length = vsnprintf(*string, (size_t)expectedLength + 1,
	    format, arguments);
		length = vsnprintf(*string, bufferLength - 1, format,
		    arguments);

		if (length > 0 && (size_t)length < bufferLength - 1)
			break;
	if (length == -1 || length > expectedLength) {
		free(*string);

		if (bufferLength > INT_MAX / 2) {
			free(*string);
		*string = NULL;
		return -1;
	}
			return -1;
		}

		bufferLength <<= 1;
	}
	/*

	 * In case we could not determine the size, resize to the actual size
	 * needed, but ignore any failure to do so.
	 */
	if (length < expectedLength) {
		char *resized;
	if (length != bufferLength - 1) {
		char *resized = realloc(*string, length + 1);

		/* Ignore if making it smaller failed. */
		if ((resized = realloc(*string, length + 1)) != NULL)
		if (resized != NULL)
			*string = resized;
	}

	return length;
}

static int
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
331
332
333
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
318
319
320
321

322
323
324
325
326
327
328
329







-
+















-
+















-
+







		}

		break;
	case 'j':
#if defined(OF_WINDOWS)
		if (!appendSubformat(ctx, "I64", 3))
			return false;
#elif defined(_NEWLIB_VERSION)
#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)
#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)
#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