1d07e237ca
feedback and ok espie@
46 lines
2.2 KiB
Plaintext
46 lines
2.2 KiB
Plaintext
$OpenBSD: patch-src_xmlrpc_data_c,v 1.2 2008/03/15 10:35:54 ajacoutot Exp $
|
|
--- src/xmlrpc_data.c.orig Tue Jan 3 07:48:59 2006
|
|
+++ src/xmlrpc_data.c Wed Jan 16 14:20:18 2008
|
|
@@ -288,7 +288,7 @@ xmlrpc_read_string(xmlrpc_env * const envP,
|
|
if (stringValue == NULL)
|
|
xmlrpc_env_set_fault_formatted(
|
|
envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate space "
|
|
- "for %u-character string", length);
|
|
+ "for %lu-character string", (unsigned long)length);
|
|
else {
|
|
memcpy(stringValue, contents, length);
|
|
stringValue[length] = '\0';
|
|
@@ -419,8 +419,8 @@ xmlrpc_read_string_w(xmlrpc_env * const envP,
|
|
if (stringValue == NULL)
|
|
xmlrpc_env_set_fault_formatted(
|
|
envP, XMLRPC_INTERNAL_ERROR,
|
|
- "Unable to allocate space for %u-byte string",
|
|
- length);
|
|
+ "Unable to allocate space for %lu-byte string",
|
|
+ (unsigned long)length);
|
|
else {
|
|
memcpy(stringValue, wcontents, length * sizeof(wchar_t));
|
|
stringValue[length] = '\0';
|
|
@@ -466,8 +466,8 @@ xmlrpc_read_string_w_lp(xmlrpc_env * const envP,
|
|
if (stringValue == NULL)
|
|
xmlrpc_env_set_fault_formatted(
|
|
envP, XMLRPC_INTERNAL_ERROR,
|
|
- "Unable to allocate space for %u-byte string",
|
|
- size);
|
|
+ "Unable to allocate space for %lu-byte string",
|
|
+ (unsigned long)size);
|
|
else {
|
|
memcpy(stringValue, wcontents, size * sizeof(wchar_t));
|
|
|
|
@@ -523,8 +523,8 @@ xmlrpc_read_base64(xmlrpc_env * const envP,
|
|
byteStringValue = malloc(size);
|
|
if (byteStringValue == NULL)
|
|
xmlrpc_env_set_fault_formatted(
|
|
- envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %u bytes "
|
|
- "for byte string.", size);
|
|
+ envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %lu bytes "
|
|
+ "for byte string.", (unsigned long)size);
|
|
else {
|
|
memcpy(byteStringValue, contents, size);
|
|
*byteStringValueP = (const unsigned char *)byteStringValue;
|