1 From 4d3bbc5d59418666a5fc91c8fe3e301ee9c89b32 Mon Sep 17 00:00:00 2001
2 From: Enrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
3 Date: Sat, 5 Apr 2008 11:41:34 +0200
4 Subject: [PATCH 3/8] Use proper datatypes for 'long long'
6 xmlrpc-c uses 'long long' at some places (e.g. in printf
7 statements with PRId64) under the assumption that it has a
8 width of exactly 64 bits.
10 On 64 bit machines 'long long' has a width of 128 bit and
11 will cause overhead both in memory and cpu usage there. As
12 'long long' is used only to handle <i8> datatypes, the patch
13 uses a plain 64 integer type there.
15 It is arguable whether 'int_least64_t' (and 'int_least32_t')
16 would be a better choice for 'int64_t' (and 'int32_t'), but
17 for now, the patch uses datatypes with exact widths.
19 include/xmlrpc-c/base.h | 7 ++++---
20 lib/libutil/string_number.c | 1 +
21 src/cpp/param_list.cpp | 8 ++++----
22 3 files changed, 9 insertions(+), 7 deletions(-)
24 diff --git a/include/xmlrpc-c/base.h b/include/xmlrpc-c/base.h
25 index cdc9161..cbdf3d0 100644
26 --- a/include/xmlrpc-c/base.h
27 +++ b/include/xmlrpc-c/base.h
34 #include <xmlrpc-c/c_util.h>
35 #include <xmlrpc-c/util.h>
36 @@ -50,9 +51,9 @@ xmlrpc_version(unsigned int * const majorP,
38 typedef signed int xmlrpc_int;
39 /* An integer of the type defined by XML-RPC <int>; i.e. 32 bit */
40 -typedef XMLRPC_INT32 xmlrpc_int32;
41 +typedef int32_t xmlrpc_int32;
42 /* An integer of the type defined by XML-RPC <i4>; i.e. 32 bit */
43 -typedef XMLRPC_INT64 xmlrpc_int64;
44 +typedef int64_t xmlrpc_int64;
45 /* An integer of the type defined by "XML-RPC" <i8>; i.e. 64 bit */
46 typedef int xmlrpc_bool;
47 /* A boolean (of the type defined by XML-RPC <boolean>, but there's
48 @@ -89,7 +90,7 @@ typedef int xmlrpc_socket;
49 #define XMLRPC_INT32_MAX 0x7fffffff
50 #define XMLRPC_INT32_MIN (-XMLRPC_INT32_MAX - 1)
52 -#define XMLRPC_INT64_MAX 0x7fffffffffffffffll
53 +#define XMLRPC_INT64_MAX ((xmlrpc_int64)0x7fffffffffffffffll)
54 #define XMLRPC_INT64_MIN (-XMLRPC_INT64_MAX - 1)
57 diff --git a/lib/libutil/string_number.c b/lib/libutil/string_number.c
58 index 1c284af..a7e78ad 100644
59 --- a/lib/libutil/string_number.c
60 +++ b/lib/libutil/string_number.c
62 ============================================================================*/
65 +#include <inttypes.h>
68 #include <xmlrpc-c/base.h>
69 diff --git a/src/cpp/param_list.cpp b/src/cpp/param_list.cpp
70 index 67c636b..60f7df9 100644
71 --- a/src/cpp/param_list.cpp
72 +++ b/src/cpp/param_list.cpp
73 @@ -265,10 +265,10 @@ paramList::getNil(unsigned int const paramNumber) const {
79 paramList::getI8(unsigned int const paramNumber,
80 - long long const minimum,
81 - long long const maximum) const {
82 + xmlrpc_int64 const minimum,
83 + xmlrpc_int64 const maximum) const {
85 if (paramNumber >= this->paramVector.size())
86 throw(fault("Not enough parameters", fault::CODE_TYPE));
87 @@ -277,7 +277,7 @@ paramList::getI8(unsigned int const paramNumber,
88 throw(fault("Parameter that is supposed to be 64-bit integer is not",
91 - long long const longlongvalue(static_cast<long long>(
92 + xmlrpc_int64 const longlongvalue(static_cast<xmlrpc_int64>(
93 value_i8(this->paramVector[paramNumber])));
95 if (longlongvalue < minimum)