From b2e140389f7c16bfde8cbc69a460084051961db9 Mon Sep 17 00:00:00 2001
From: XhmikosR <xhmikosr@users.sourceforge.net>
Date: Wed, 31 Jul 2013 17:02:37 +0300
Subject: [PATCH] * Move system includes before local ones * Remove superfluous
 newlines

---
 htdocs/archive/createzip.c   |  5 ++--
 htdocs/archive/deletefile.c  |  1 -
 htdocs/archive/edit.c        |  1 -
 htdocs/archive/renamefile.c  |  1 -
 htdocs/archive/setfiledata.c |  1 -
 htdocs/archive/validatexml.c |  4 +---
 htdocs/archive/webarchive.h  |  2 --
 lib/checkmemoryleak.cpp      | 44 +-----------------------------------
 8 files changed, 4 insertions(+), 55 deletions(-)

diff --git a/htdocs/archive/createzip.c b/htdocs/archive/createzip.c
index 255579704..b5cd24ac3 100644
--- a/htdocs/archive/createzip.c
+++ b/htdocs/archive/createzip.c
@@ -1,10 +1,9 @@
+#include <stdio.h>
+#include <stdlib.h>
 
 #include "webarchive.h"
 #include "miniz.c"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 #define ALL_ZIP   "all.zip"
 
 int main()
diff --git a/htdocs/archive/deletefile.c b/htdocs/archive/deletefile.c
index d9e441d83..155c0f817 100644
--- a/htdocs/archive/deletefile.c
+++ b/htdocs/archive/deletefile.c
@@ -59,4 +59,3 @@ int main()
 
     return EXIT_SUCCESS;
 }
-
diff --git a/htdocs/archive/edit.c b/htdocs/archive/edit.c
index ae1726154..d93450ce3 100644
--- a/htdocs/archive/edit.c
+++ b/htdocs/archive/edit.c
@@ -66,4 +66,3 @@ int main()
 
     return EXIT_SUCCESS;
 }
-
diff --git a/htdocs/archive/renamefile.c b/htdocs/archive/renamefile.c
index 6d3434448..f8aebfb5d 100644
--- a/htdocs/archive/renamefile.c
+++ b/htdocs/archive/renamefile.c
@@ -96,4 +96,3 @@ int main()
 
     return EXIT_SUCCESS;
 }
-
diff --git a/htdocs/archive/setfiledata.c b/htdocs/archive/setfiledata.c
index 77e936fd9..7bf5575bc 100644
--- a/htdocs/archive/setfiledata.c
+++ b/htdocs/archive/setfiledata.c
@@ -70,4 +70,3 @@ int main()
 
     return EXIT_SUCCESS;
 }
-
diff --git a/htdocs/archive/validatexml.c b/htdocs/archive/validatexml.c
index b76815c3f..d1abbc3a6 100644
--- a/htdocs/archive/validatexml.c
+++ b/htdocs/archive/validatexml.c
@@ -1,8 +1,7 @@
-
-#include "validatexml.h"
 #include <string.h>
 #include <stdio.h>
 #include <ctype.h>
+#include "validatexml.h"
 
 void skipspaces(const char xmldata[], int *pos, int *linenr)
 {
@@ -112,4 +111,3 @@ int validatexml(const char xmldata[])
 
     return -1;
 }
-
diff --git a/htdocs/archive/webarchive.h b/htdocs/archive/webarchive.h
index db84f25b6..3d70d4349 100644
--- a/htdocs/archive/webarchive.h
+++ b/htdocs/archive/webarchive.h
@@ -188,5 +188,3 @@ const char *validate_name_version_data(const char *data)
     // No error
     return NULL;
 }
-
-
diff --git a/lib/checkmemoryleak.cpp b/lib/checkmemoryleak.cpp
index af0ce3bb4..e3aa623ef 100644
--- a/lib/checkmemoryleak.cpp
+++ b/lib/checkmemoryleak.cpp
@@ -1384,8 +1384,6 @@ Token *CheckMemoryLeakInFunction::getcode(const Token *tok, std::list<const Toke
 
 
 
-
-
 void CheckMemoryLeakInFunction::simplifycode(Token *tok) const
 {
     {
@@ -1983,8 +1981,6 @@ void CheckMemoryLeakInFunction::simplifycode(Token *tok) const
 
 
 
-
-
 const Token *CheckMemoryLeakInFunction::findleak(const Token *tokens)
 {
     const Token *result;
@@ -2034,10 +2030,6 @@ const Token *CheckMemoryLeakInFunction::findleak(const Token *tokens)
 }
 
 
-
-
-
-
 // Check for memory leaks for a function variable.
 void CheckMemoryLeakInFunction::checkScope(const Token *Tok1, const std::string &varname, unsigned int varid, bool classmember, unsigned int sz)
 {
@@ -2148,15 +2140,13 @@ void CheckMemoryLeakInFunction::checkScope(const Token *Tok1, const std::string
 //---------------------------------------------------------------------------
 
 
-
-
-
 //---------------------------------------------------------------------------
 // Check for memory leaks due to improper realloc() usage.
 //   Below, "a" may be set to null without being freed if realloc() cannot
 //   allocate the requested memory:
 //     a = malloc(10); a = realloc(a, 100);
 //---------------------------------------------------------------------------
+
 static bool isNoArgument(const SymbolDatabase* symbolDatabase, unsigned int varid)
 {
     const Variable* var = symbolDatabase->getVariableFromVarId(varid);
@@ -2216,10 +2206,6 @@ void CheckMemoryLeakInFunction::checkReallocUsage()
 //---------------------------------------------------------------------------
 
 
-
-
-
-
 //---------------------------------------------------------------------------
 // Checks for memory leaks inside function..
 //---------------------------------------------------------------------------
@@ -2274,39 +2260,11 @@ void CheckMemoryLeakInFunction::check()
 //---------------------------------------------------------------------------
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 //---------------------------------------------------------------------------
 // Checks for memory leaks in classes..
 //---------------------------------------------------------------------------
 
 
-
 void CheckMemoryLeakInClass::check()
 {
     const SymbolDatabase *symbolDatabase = _tokenizer->getSymbolDatabase();