diff options
| author | Denys Vlasenko <dvlasenk@redhat.com> | 2011-01-11 18:53:22 +0100 |
|---|---|---|
| committer | Denys Vlasenko <dvlasenk@redhat.com> | 2011-01-11 18:53:22 +0100 |
| commit | e7fde9b01293d7bfdfe644b73f8ac679211d0b08 (patch) | |
| tree | d772f47e525baedadba3517ff59d2782953cce2c /src/lib | |
| parent | f4dcdc9a1ee5971bfda6acf079d615a6f40382b1 (diff) | |
| download | abrt-e7fde9b01293d7bfdfe644b73f8ac679211d0b08.tar.gz abrt-e7fde9b01293d7bfdfe644b73f8ac679211d0b08.tar.xz abrt-e7fde9b01293d7bfdfe644b73f8ac679211d0b08.zip | |
remove C++-ism ssprintf from abrtlib.h
Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/abrt_dbus.h | 14 | ||||
| -rw-r--r-- | src/lib/abrt_xmlrpc.cpp | 5 |
2 files changed, 15 insertions, 4 deletions
diff --git a/src/lib/abrt_dbus.h b/src/lib/abrt_dbus.h index 2f32b26f..d8cc3aa8 100644 --- a/src/lib/abrt_dbus.h +++ b/src/lib/abrt_dbus.h @@ -125,6 +125,20 @@ int load_vector_of_crash_data(DBusMessageIter* iter, vector_of_crash_data_t **va * Helpers for building DBus messages */ +static inline std::string ssprintf(const char *format, ...) +{ + va_list p; + char *string_ptr; + + va_start(p, format); + string_ptr = xvasprintf(format, p); + va_end(p); + + std::string res = string_ptr; + free(string_ptr); + return res; +} + //static inline void store_val(DBusMessageIter* iter, bool val) { store_bool(iter, val); } static inline void store_val(DBusMessageIter* iter, int32_t val) { store_int32(iter, val); } static inline void store_val(DBusMessageIter* iter, uint32_t val) { store_uint32(iter, val); } diff --git a/src/lib/abrt_xmlrpc.cpp b/src/lib/abrt_xmlrpc.cpp index 62748e29..e2b8674c 100644 --- a/src/lib/abrt_xmlrpc.cpp +++ b/src/lib/abrt_xmlrpc.cpp @@ -21,10 +21,7 @@ void throw_xml_fault(xmlrpc_env *env) { - std::string errmsg = ssprintf("XML-RPC Fault(%d): %s", env->fault_code, env->fault_string); - xmlrpc_env_clean(env); // this is needed ONLY if fault_occurred - xmlrpc_env_init(env); // just in case user catches ex and _continues_ to use env - error_msg_and_die("%s", errmsg.c_str()); // show error in daemon log + error_msg_and_die("XML-RPC Fault(%d): %s", env->fault_code, env->fault_string); } void throw_if_xml_fault_occurred(xmlrpc_env *env) |