msg_prefix now doesn't need ": " suffix

Contains some other trivial changes

Signed-off-by: Denys Vlasenko <dvlasenk@redhat.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/daemon/Daemon.cpp b/src/daemon/Daemon.cpp
index 5d70c255..a0875279 100644
--- a/src/daemon/Daemon.cpp
+++ b/src/daemon/Daemon.cpp
@@ -787,7 +787,7 @@ int main(int argc, char** argv)
         }
     }
 
-    msg_prefix = "abrtd: "; /* for log(), error_msg() and such */
+    msg_prefix = "abrtd"; /* for log(), error_msg() and such */
 
     xpipe(s_signal_pipe);
     close_on_exec_on(s_signal_pipe[0]);
@@ -839,7 +839,6 @@ int main(int argc, char** argv)
     bool lockfile_created = false;
     bool pidfile_created = false;
     CCrashWatcher watcher;
-    xmlrpc_env env;
 
     /* Initialization */
     try
@@ -851,10 +850,12 @@ int main(int argc, char** argv)
             throw 1;
 
         VERB1 log("Initializing XML-RPC library");
+        xmlrpc_env env;
         xmlrpc_env_init(&env);
         xmlrpc_client_setup_global_const(&env);
         if (env.fault_occurred)
             error_msg_and_die("XML-RPC Fault: %s(%d)", env.fault_string, env.fault_code);
+        xmlrpc_env_clean(&env);
 
         VERB1 log("Initializing rpm library");
         rpm_init();
@@ -966,7 +967,6 @@ int main(int argc, char** argv)
     /* Error or INT/TERM. Clean up, in reverse order.
      * Take care to not undo things we did not do.
      */
-    xmlrpc_env_clean(&env);
     xmlrpc_client_teardown_global_const();
     dumpsocket_shutdown();
     rpm_destroy();