Merge branch 'master' of ssh://git.fedorahosted.org/git/abrt

6 files changed, 13 insertions, 20 deletions

diff --git a/src/Daemon/CommLayerServerDBus.cpp b/src/Daemon/CommLayerServerDBus.cpp
index 08cd3d5..f710fd9 100644
--- a/src/Daemon/CommLayerServerDBus.cpp
+++ b/src/Daemon/CommLayerServerDBus.cpp
@@ -430,7 +430,7 @@ static int handle_SetSettings(DBusMessage* call, DBusMessage* reply)
  */
 
 /* Callback: "a message is received to a registered object path" */
-static DBusHandlerResult message_received(DBusConnection *conn, DBusMessage *msg, void* data)
+static DBusHandlerResult message_received(DBusConnection* conn, DBusMessage* msg, void* data)
 {
     const char* member = dbus_message_get_member(msg);
     log("%s(method:'%s')", __func__, member);
@@ -499,7 +499,7 @@ static void handle_dbus_err(bool error_flag, DBusError *err)
     if (!error_flag)
         return;
     error_msg_and_die(
-            "error requesting DBus name %s, possible reasons: "
+            "Error requesting DBus name %s, possible reasons: "
             "abrt run by non-root; dbus config is incorrect",
             CC_DBUS_NAME);
 }
@@ -511,13 +511,14 @@ CCommLayerServerDBus::CCommLayerServerDBus()
 
     dbus_error_init(&err);
     VERB3 log("dbus_bus_get");
-    g_dbus_conn = conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
+    conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err);
     handle_dbus_err(conn == NULL, &err);
 
     attach_dbus_conn_to_glib_main_loop(conn, "/com/redhat/abrt", message_received);
 
     VERB3 log("dbus_bus_request_name");
     int rc = dbus_bus_request_name(conn, CC_DBUS_NAME, DBUS_NAME_FLAG_REPLACE_EXISTING, &err);
+//maybe check that r == DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER instead?
     handle_dbus_err(rc < 0, &err);
     VERB3 log("dbus init done");
 }
diff --git a/src/Daemon/CommLayerServerSocket.cpp b/src/Daemon/CommLayerServerSocket.cpp
index b643aaa..6b62928 100644
--- a/src/Daemon/CommLayerServerSocket.cpp
+++ b/src/Daemon/CommLayerServerSocket.cpp
@@ -1,7 +1,5 @@
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <iostream>
-#include <sstream>
 #include "abrtlib.h"
 #include "CommLayerInner.h"
 #include "ABRTException.h"
@@ -44,9 +42,7 @@ std::string CCommLayerServerSocket::GetSenderUID(int pSenderSocket)
     {
         throw CABRTException(EXCEP_ERROR, "CCommLayerServerSocket::GetSenderUID(): Error can get sender uid.");
     }
-    std::stringstream ss;
-    ss << creds.uid;
-    return ss.str();
+    return to_string(creds.uid);
 }
 
 gboolean CCommLayerServerSocket::client_socket_cb(GIOChannel *source, GIOCondition condition, gpointer data)
diff --git a/src/Daemon/CrashWatcher.cpp b/src/Daemon/CrashWatcher.cpp
index 826dc9e..5cc9dc7 100644
--- a/src/Daemon/CrashWatcher.cpp
+++ b/src/Daemon/CrashWatcher.cpp
@@ -17,8 +17,6 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
-#include <iostream>
-#include <sstream>
 #include "abrtlib.h"
 #include "Daemon.h"
 #include "ABRTException.h"
diff --git a/src/Daemon/Daemon.cpp b/src/Daemon/Daemon.cpp
index 70f471c..3c48627 100644
--- a/src/Daemon/Daemon.cpp
+++ b/src/Daemon/Daemon.cpp
@@ -21,7 +21,6 @@
 #include <sys/inotify.h>
 #include <glib.h>
 #include <pthread.h>
-#include <iostream>
 #include <string>
 #if HAVE_CONFIG_H
     #include <config.h>
diff --git a/src/Daemon/PluginManager.cpp b/src/Daemon/PluginManager.cpp
index be14f4b..a36d5a8 100644
--- a/src/Daemon/PluginManager.cpp
+++ b/src/Daemon/PluginManager.cpp
@@ -103,17 +103,16 @@ bool LoadPluginSettings(const std::string& pPath, map_plugin_settings_t& pSettin
  */
 static bool SavePluginSettings(const std::string& pPath, const map_plugin_settings_t& pSettings)
 {
-    std::ofstream fOut;
-    fOut.open(pPath.c_str());
-    if (fOut.is_open())
+    FILE* fOut = fopen(pPath.c_str(), "w");
+    if (fOut)
     {
-        fOut << "# Settings were written by abrt." << std::endl;
-        map_plugin_settings_t::const_iterator it;
-        for (it = pSettings.begin(); it != pSettings.end(); it++)
+        fprintf(fOut, "# Settings were written by abrt\n");
+        map_plugin_settings_t::const_iterator it = pSettings.begin();
+        for (; it != pSettings.end(); it++)
         {
-            fOut << it->first << " = " << it->second << std::endl;
+            fprintf(fOut, "%s = %s\n", it->first.c_str(), it->second.c_str());
         }
-        fOut.close();
+        fclose(fOut);
         return true;
     }
     return false;
diff --git a/src/Daemon/Settings.cpp b/src/Daemon/Settings.cpp
index 90c8916..1eb4226 100644
--- a/src/Daemon/Settings.cpp
+++ b/src/Daemon/Settings.cpp
@@ -1,8 +1,8 @@
+#include <fstream>
 #include "Settings.h"
 #include "abrtlib.h"
 #include "abrt_types.h"
 #include "Polkit.h"
-#include <fstream>
 
 #define SECTION_COMMON      "Common"
 #define SECTION_ANALYZER_ACTIONS_AND_REPORTERS   "AnalyzerActionsAndReporters"