diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-28 15:34:08 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2010-01-28 15:34:08 +0100 |
| commit | 9180163f65df24d7df684a1baa2ee3bb253bf516 (patch) | |
| tree | e1ee68d387dfb4358b897d78eccee4e7e565ea17 /lib/Utils/abrt_xmlrpc.cpp | |
| parent | efb5ca1baa123a357fad58849b10fb8845cef165 (diff) | |
| parent | 099f3cac8c2bf532a796468fb2950c4551c85960 (diff) | |
| download | abrt-9180163f65df24d7df684a1baa2ee3bb253bf516.tar.gz abrt-9180163f65df24d7df684a1baa2ee3bb253bf516.tar.xz abrt-9180163f65df24d7df684a1baa2ee3bb253bf516.zip | |
Merge branch 'master' into rhel6
Conflicts:
src/Daemon/abrt.conf
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'lib/Utils/abrt_xmlrpc.cpp')
| -rw-r--r-- | lib/Utils/abrt_xmlrpc.cpp | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/Utils/abrt_xmlrpc.cpp b/lib/Utils/abrt_xmlrpc.cpp index e3a4648..c2d716e 100644 --- a/lib/Utils/abrt_xmlrpc.cpp +++ b/lib/Utils/abrt_xmlrpc.cpp @@ -15,7 +15,6 @@ CURL* xcurl_easy_init() return curl; } -#if 1 void throw_xml_fault(xmlrpc_env *env) { std::string errmsg = ssprintf("XML-RPC Fault: %s(%d)", env->fault_string, env->fault_code); @@ -24,19 +23,13 @@ void throw_xml_fault(xmlrpc_env *env) error_msg("%s", errmsg.c_str()); // show error in daemon log throw CABRTException(EXCEP_PLUGIN, errmsg.c_str()); } -#else void throw_if_xml_fault_occurred(xmlrpc_env *env) { if (env->fault_occurred) { - std::string errmsg = ssprintf("XML-RPC Fault: %s(%d)", env->fault_string, env->fault_code); - 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("%s", errmsg.c_str()); // show error in daemon log - throw CABRTException(EXCEP_PLUGIN, errmsg.c_str()); + throw_xml_fault(env); } } -#endif void abrt_xmlrpc_conn::new_xmlrpc_client(const char* url, bool no_ssl_verify) { |