removed obsoleted patch
This commit is contained in:
ensc
parent
fea1e8af88
commit
206b367d73
@ -1,146 +0,0 @@
|
|||||||
2006-06-04 Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
|
|
||||||
|
|
||||||
* fixed a lot of format strings which produce
|
|
||||||
|
|
||||||
| warning: format '%d' expects type 'int', but argument 6 has type 'size_t'
|
|
||||||
|
|
||||||
style warnings on x86_64 machines else
|
|
||||||
|
|
||||||
--- xmlrpc-c-1.05/lib/libutil/memblock.c.sizet 2005-09-23 04:17:23.000000000 +0200
|
|
||||||
+++ xmlrpc-c-1.05/lib/libutil/memblock.c 2006-06-04 19:02:10.000000000 +0200
|
|
||||||
@@ -73,7 +73,7 @@ xmlrpc_mem_block_init(xmlrpc_env *
|
|
||||||
|
|
||||||
blockP->_block = (void*) malloc(blockP->_allocated);
|
|
||||||
if (!blockP->_block)
|
|
||||||
- xmlrpc_faultf(envP, "Can't allocate %u-byte memory block",
|
|
||||||
+ xmlrpc_faultf(envP, "Can't allocate %zu-byte memory block",
|
|
||||||
blockP->_allocated);
|
|
||||||
}
|
|
||||||
|
|
||||||
--- xmlrpc-c-1.05/src/xmlrpc_data.c.sizet 2006-01-03 07:48:59.000000000 +0100
|
|
||||||
+++ xmlrpc-c-1.05/src/xmlrpc_data.c 2006-06-04 19:06:02.000000000 +0200
|
|
||||||
@@ -288,7 +288,7 @@ xmlrpc_read_string(xmlrpc_env *
|
|
||||||
if (stringValue == NULL)
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate space "
|
|
||||||
- "for %u-character string", length);
|
|
||||||
+ "for %zu-character string", length);
|
|
||||||
else {
|
|
||||||
memcpy(stringValue, contents, length);
|
|
||||||
stringValue[length] = '\0';
|
|
||||||
@@ -419,7 +419,7 @@ xmlrpc_read_string_w(xmlrpc_env * co
|
|
||||||
if (stringValue == NULL)
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
envP, XMLRPC_INTERNAL_ERROR,
|
|
||||||
- "Unable to allocate space for %u-byte string",
|
|
||||||
+ "Unable to allocate space for %zu-byte string",
|
|
||||||
length);
|
|
||||||
else {
|
|
||||||
memcpy(stringValue, wcontents, length * sizeof(wchar_t));
|
|
||||||
@@ -466,7 +466,7 @@ xmlrpc_read_string_w_lp(xmlrpc_env *
|
|
||||||
if (stringValue == NULL)
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
envP, XMLRPC_INTERNAL_ERROR,
|
|
||||||
- "Unable to allocate space for %u-byte string",
|
|
||||||
+ "Unable to allocate space for %zu-byte string",
|
|
||||||
size);
|
|
||||||
else {
|
|
||||||
memcpy(stringValue, wcontents, size * sizeof(wchar_t));
|
|
||||||
@@ -523,7 +523,7 @@ xmlrpc_read_base64(xmlrpc_env *
|
|
||||||
byteStringValue = malloc(size);
|
|
||||||
if (byteStringValue == NULL)
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
- envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %u bytes "
|
|
||||||
+ envP, XMLRPC_INTERNAL_ERROR, "Unable to allocate %zu bytes "
|
|
||||||
"for byte string.", size);
|
|
||||||
else {
|
|
||||||
memcpy(byteStringValue, contents, size);
|
|
||||||
--- xmlrpc-c-1.05/src/xmlrpc_datetime.c.sizet 2006-01-03 04:39:22.000000000 +0100
|
|
||||||
+++ xmlrpc-c-1.05/src/xmlrpc_datetime.c 2006-06-04 19:06:37.000000000 +0200
|
|
||||||
@@ -331,7 +331,7 @@ validateFormat(xmlrpc_env * const envP,
|
|
||||||
const char * const t) {
|
|
||||||
|
|
||||||
if (strlen(t) != 17)
|
|
||||||
- xmlrpc_faultf(envP, "%u characters instead of 15.", strlen(t));
|
|
||||||
+ xmlrpc_faultf(envP, "%zu characters instead of 15.", strlen(t));
|
|
||||||
else if (t[8] != 'T')
|
|
||||||
xmlrpc_faultf(envP, "9th character is '%c', not 'T'", t[8]);
|
|
||||||
else {
|
|
||||||
--- xmlrpc-c-1.05/src/xmlrpc_parse.c.sizet 2006-03-23 00:48:31.000000000 +0100
|
|
||||||
+++ xmlrpc-c-1.05/src/xmlrpc_parse.c 2006-06-04 19:10:00.000000000 +0200
|
|
||||||
@@ -57,7 +57,7 @@
|
|
||||||
do \
|
|
||||||
if (xml_element_children_size(elem) != (count)) \
|
|
||||||
XMLRPC_FAIL3(env, XMLRPC_PARSE_ERROR, \
|
|
||||||
- "Expected <%s> to have %d children, found %d", \
|
|
||||||
+ "Expected <%s> to have %d children, found %zd", \
|
|
||||||
xml_element_name(elem), (count), \
|
|
||||||
xml_element_children_size(elem)); \
|
|
||||||
while (0)
|
|
||||||
@@ -595,7 +595,7 @@ parseMethodNameElement(xmlrpc_env * con
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
envP, XMLRPC_PARSE_ERROR,
|
|
||||||
"A <methodName> element should not have children. "
|
|
||||||
- "This one has %u of them.", xml_element_children_size(nameElemP));
|
|
||||||
+ "This one has %zu of them.", xml_element_children_size(nameElemP));
|
|
||||||
else {
|
|
||||||
const char * const cdata = xml_element_cdata(nameElemP);
|
|
||||||
|
|
||||||
@@ -654,7 +654,7 @@ parseCallChildren(xmlrpc_env * const
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
envP, XMLRPC_PARSE_ERROR,
|
|
||||||
"<methodCall> has extraneous children, other than "
|
|
||||||
- "<methodName> and <params>. Total child count = %u",
|
|
||||||
+ "<methodName> and <params>. Total child count = %zu",
|
|
||||||
callChildCount);
|
|
||||||
|
|
||||||
if (envP->fault_occurred)
|
|
||||||
@@ -697,7 +697,7 @@ xmlrpc_parse_call(xmlrpc_env * const
|
|
||||||
if (xmlLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
envP, XMLRPC_LIMIT_EXCEEDED_ERROR,
|
|
||||||
- "XML-RPC request too large. Max allowed is %u bytes",
|
|
||||||
+ "XML-RPC request too large. Max allowed is %zu bytes",
|
|
||||||
xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID));
|
|
||||||
else {
|
|
||||||
xml_element * callElemP;
|
|
||||||
@@ -773,7 +773,7 @@ parseFaultElement(xmlrpc_env * co
|
|
||||||
if (xml_element_children_size(faultElement) != 1)
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
envP, XMLRPC_PARSE_ERROR,
|
|
||||||
- "<fault> element should have 1 child, but it has %u.",
|
|
||||||
+ "<fault> element should have 1 child, but it has %zu.",
|
|
||||||
xml_element_children_size(faultElement));
|
|
||||||
else {
|
|
||||||
xml_element * const faultValueP =
|
|
||||||
@@ -869,7 +869,7 @@ parseMethodResponseElt(xmlrpc_env *
|
|
||||||
} else
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
envP, XMLRPC_PARSE_ERROR,
|
|
||||||
- "<methodResponse> has %u children, should have 1.",
|
|
||||||
+ "<methodResponse> has %zu children, should have 1.",
|
|
||||||
xml_element_children_size(methodResponseEltP));
|
|
||||||
}
|
|
||||||
|
|
||||||
@@ -908,8 +908,8 @@ xmlrpc_parse_response2(xmlrpc_env * c
|
|
||||||
if (xmlDataLen > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
envP, XMLRPC_LIMIT_EXCEEDED_ERROR,
|
|
||||||
- "XML-RPC response too large. Our limit is %u characters. "
|
|
||||||
- "We got %u characters",
|
|
||||||
+ "XML-RPC response too large. Our limit is %zu characters. "
|
|
||||||
+ "We got %zu characters",
|
|
||||||
xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID), xmlDataLen);
|
|
||||||
else {
|
|
||||||
xml_parse(envP, xmlData, xmlDataLen, &response);
|
|
||||||
--- xmlrpc-c-1.05/src/xmlrpc_server_abyss.c.sizet 2006-03-25 20:15:31.000000000 +0100
|
|
||||||
+++ xmlrpc-c-1.05/src/xmlrpc_server_abyss.c 2006-06-04 19:11:24.000000000 +0200
|
|
||||||
@@ -348,7 +348,7 @@ processCall(TSession * const abys
|
|
||||||
if (contentSize > xmlrpc_limit_get(XMLRPC_XML_SIZE_LIMIT_ID))
|
|
||||||
xmlrpc_env_set_fault_formatted(
|
|
||||||
&env, XMLRPC_LIMIT_EXCEEDED_ERROR,
|
|
||||||
- "XML-RPC request too large (%d bytes)", contentSize);
|
|
||||||
+ "XML-RPC request too large (%zd bytes)", contentSize);
|
|
||||||
else {
|
|
||||||
xmlrpc_mem_block *body;
|
|
||||||
/* Read XML data off the wire. */
|
|
||||||
@ -14,7 +14,6 @@ URL: http://xmlrpc-c.sourceforge.net/
|
|||||||
# upstream does not tag versions so we must fetch from the branch and
|
# upstream does not tag versions so we must fetch from the branch and
|
||||||
# check which version was used for it
|
# check which version was used for it
|
||||||
%{?advanced_branch:Source0: xmlrpc-c-%version.tar.bz2}
|
%{?advanced_branch:Source0: xmlrpc-c-%version.tar.bz2}
|
||||||
Patch6: xmlrpc-c-1.06.04-sizet.patch
|
|
||||||
Patch100: make-cmake-transition.patch
|
Patch100: make-cmake-transition.patch
|
||||||
Patch101: added-virtual-destructors-for-classes-with-virtual-m.patch
|
Patch101: added-virtual-destructors-for-classes-with-virtual-m.patch
|
||||||
Patch102: fixed-broken-format-string-modifiers-for-size_t-type.patch
|
Patch102: fixed-broken-format-string-modifiers-for-size_t-type.patch
|
||||||
@ -62,7 +61,6 @@ This package contains some handy XML-RPC demo applications.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
#patch6 -p1 -b .sizet
|
|
||||||
%patch100 -p1
|
%patch100 -p1
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user