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

9 files changed, 26 insertions, 37 deletions

diff --git a/lib/Plugins/Bugzilla.cpp b/lib/Plugins/Bugzilla.cpp
index 9c223a6..a3c70f0 100644
--- a/lib/Plugins/Bugzilla.cpp
+++ b/lib/Plugins/Bugzilla.cpp
@@ -1,6 +1,5 @@
 
 #include <xmlrpc-c/base.hpp>
-#include <sstream>
 #include "abrtlib.h"
 #include "Bugzilla.h"
 #include "CrashTypes.h"
diff --git a/lib/Plugins/CCpp.cpp b/lib/Plugins/CCpp.cpp
index 19b4895..3276b24 100644
--- a/lib/Plugins/CCpp.cpp
+++ b/lib/Plugins/CCpp.cpp
@@ -19,20 +19,19 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
-#include "abrtlib.h"
-#include "CCpp.h"
-#include "ABRTException.h"
-#include "DebugDump.h"
-#include "CommLayerInner.h"
-#include "Polkit.h"
 #include <sys/wait.h>
 #include <fstream>
 #include <sstream>
 #include <set>
 #include <iomanip>
-
 #include <nss.h>
 #include <sechash.h>
+#include "abrtlib.h"
+#include "CCpp.h"
+#include "ABRTException.h"
+#include "DebugDump.h"
+#include "CommLayerInner.h"
+#include "Polkit.h"
 
 #define CORE_PATTERN_IFACE "/proc/sys/kernel/core_pattern"
 #define CORE_PATTERN "|"CCPP_HOOK_PATH" "DEBUG_DUMPS_DIR" %p %s %u"
diff --git a/lib/Plugins/FileTransfer.cpp b/lib/Plugins/FileTransfer.cpp
index 9e2ee1a..9ae6501 100644
--- a/lib/Plugins/FileTransfer.cpp
+++ b/lib/Plugins/FileTransfer.cpp
@@ -23,7 +23,6 @@
 #include <sstream>
 #include <fstream>
 #include <curl/curl.h>
-
 #include "abrtlib.h"
 #include "FileTransfer.h"
 #include "DebugDump.h"
diff --git a/lib/Plugins/Kerneloops.cpp b/lib/Plugins/Kerneloops.cpp
index 8e34392..e01bb42 100644
--- a/lib/Plugins/Kerneloops.cpp
+++ b/lib/Plugins/Kerneloops.cpp
@@ -24,38 +24,38 @@
  *      Arjan van de Ven <arjan@linux.intel.com>
  */
 
+#include "abrtlib.h"
 #include "Kerneloops.h"
 #include "DebugDump.h"
 #include "ABRTException.h"
 #include "CommLayerInner.h"
 
-#include <sstream>
-
 #define FILENAME_KERNELOOPS  "kerneloops"
 
 std::string CAnalyzerKerneloops::GetLocalUUID(const std::string& pDebugDumpDir)
 {
-	update_client(_("Getting local/global universal unique identification..."));
+	log(_("Getting local universal unique identification"));
 
-	std::string m_sOops;
-	std::stringstream m_sHash;
-	CDebugDump m_pDebugDump;
-	m_pDebugDump.Open(pDebugDumpDir);
-	m_pDebugDump.LoadText(FILENAME_KERNELOOPS, m_sOops);
-	m_pDebugDump.Close();
+	std::string oops;
+	{
+		CDebugDump dd;
+		dd.Open(pDebugDumpDir);
+		dd.LoadText(FILENAME_KERNELOOPS, oops);
+	}
 
 	/* An algorithm proposed by Donald E. Knuth in The Art Of Computer
 	 * Programming Volume 3, under the topic of sorting and search
 	 * chapter 6.4.
 	 */
-	unsigned int m_nHash = static_cast<unsigned int>(m_sOops.length());
-	for(std::size_t i = 0; i < m_sOops.length(); i++)
+	unsigned len = oops.length();
+	unsigned hash = len;
+	for (unsigned i = 0; i < len; i++)
 	{
-		m_nHash = ((m_nHash << 5) ^ (m_nHash >> 27)) ^ m_sOops[i];
+		hash = ((hash << 5) ^ (hash >> 27)) ^ oops[i];
 	}
-	m_sHash << (m_nHash & 0x7FFFFFFF);
+	hash &= 0x7FFFFFFF;
 
-	return m_sHash.str();
+	return to_string(hash);
 }
 
 std::string CAnalyzerKerneloops::GetGlobalUUID(const std::string& pDebugDumpDir)
diff --git a/lib/Plugins/Mailx.cpp b/lib/Plugins/Mailx.cpp
index 8d00951..f7a86fd 100644
--- a/lib/Plugins/Mailx.cpp
+++ b/lib/Plugins/Mailx.cpp
@@ -20,10 +20,9 @@
     */
 
 
-#include "Mailx.h"
-#include "abrtlib.h"
 #include <stdio.h>
-#include <sstream>
+#include "abrtlib.h"
+#include "Mailx.h"
 #include "DebugDump.h"
 #include "ABRTException.h"
 #include "CommLayerInner.h"
diff --git a/lib/Plugins/Python.cpp b/lib/Plugins/Python.cpp
index 3e6926c..9be76b3 100644
--- a/lib/Plugins/Python.cpp
+++ b/lib/Plugins/Python.cpp
@@ -1,7 +1,6 @@
+#include <fstream>
 #include "Python.h"
 #include "DebugDump.h"
-
-#include <fstream>
 #include "ABRTException.h"
 
 #define FILENAME_BACKTRACE      "backtrace"
diff --git a/lib/Plugins/SOSreport.cpp b/lib/Plugins/SOSreport.cpp
index 0e47ff8..ab6125c 100644
--- a/lib/Plugins/SOSreport.cpp
+++ b/lib/Plugins/SOSreport.cpp
@@ -18,15 +18,12 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
     */
 
-#include "SOSreport.h"
-
 #include <stdio.h>
 #include <string.h>
 #include <ext/stdio_filebuf.h>
-
 #include <fstream>
 #include <sstream>
-
+#include "SOSreport.h"
 #include "DebugDump.h"
 #include "ABRTException.h"
 #include "CommLayerInner.h"
diff --git a/lib/Plugins/SQLite3.cpp b/lib/Plugins/SQLite3.cpp
index 700ac91..797ed2d 100644
--- a/lib/Plugins/SQLite3.cpp
+++ b/lib/Plugins/SQLite3.cpp
@@ -20,11 +20,10 @@
     */
 
 #include <sqlite3.h>
-#include "SQLite3.h"
 #include <string>
-#include <iostream>
-#include "ABRTException.h"
 #include <stdlib.h>
+#include "SQLite3.h"
+#include "ABRTException.h"
 
 
 #define ABRT_TABLE_VERSION      2
diff --git a/lib/Plugins/TicketUploader.cpp b/lib/Plugins/TicketUploader.cpp
index db09b88..69243cd 100644
--- a/lib/Plugins/TicketUploader.cpp
+++ b/lib/Plugins/TicketUploader.cpp
@@ -490,5 +490,3 @@ PLUGIN_INFO(REPORTER,
             "gavin@redhat.com",
             "https://fedorahosted.org/abtr/wiki",
             PLUGINS_LIB_DIR"/TicketUploader.GTKBuilder");
-
-