Prettyfied everything; Added lint and pretty targets

das-labor · Oct 17, 2017 · c7b11f4 · c7b11f4
1 parent beb0e13
commit c7b11f4
Show file tree

Hide file tree

Showing 8 changed files with 483 additions and 557 deletions.
diff --git a/.clang-format b/.clang-format
@@ -0,0 +1,4 @@
+---
+BasedOnStyle: Google
+
+...
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -754,6 +754,32 @@ target_link_libraries(test-neopg PRIVATE
   GTest::GTest GTest::Main)
 add_test(NeoPGTest test-neopg COMMAND test-neopg test_xml_output --gtest_output=xml:test-neopg.xml)
 
+# get all project files
+file(GLOB_RECURSE ALL_SOURCE_FILES ${CMAKE_SOURCE_DIR}/src/*.cpp ${CMAKE_SOURCE_DIR}/src/*.h ${CMAKE_SOURCE_DIR}/include/*.cpp ${CMAKE_SOURCE_DIR}/include/*.h )
+
+# additional target to perform cppcheck run, requires cppcheck
+
+add_custom_target(
+  lint
+  COMMAND cppcheck
+  --enable=warning,performance,portability,information,missingInclude
+  --std=c++11
+  --language=c++
+  --verbose
+  --quiet
+  ${ALL_SOURCE_FILES}
+)
+
+# additional target to perform clang-format run, requires clang-format
+
+
+add_custom_target(
+  pretty
+  COMMAND clang-format
+  -style=Google
+  -i
+  ${ALL_SOURCE_FILES}
+)
 
 
 #if(CMAKE_COMPILER_IS_GNUCXX)

diff --git a/include/neopg/openpgp/tag.h b/include/neopg/openpgp/tag.h
@@ -12,121 +12,108 @@
 #include <stdexcept>
 
 namespace NeoPG {
-  namespace OpenPGP {
-
-    enum class PacketType : uint8_t {
-      Reserved = 0,
-      PublicKeyEncryptedSessionKey = 1,
-      Signature = 2,
-      SymmetricKeyEncryptedSessionKey = 3,
-      OnePassSignature = 4,
-      SecretKey = 5,
-      PublicKey = 6,
-      SecretSubkey = 7,
-      CompressedData = 8,
-      SymmetricallyEncryptedData = 9,
-      Marker = 10,
-      LiteralData = 11,
-      Trust = 12,
-      UserID = 13,
-      PublicSubkey = 14,
-      UserAttribute = 17,
-      SymmetricallyEncryptedAndIntegrityProtectedData = 18,
-      ModificationDetectionCode = 19,
-      Private60 = 60,
-      Private61 = 61,
-      Private62 = 62,
-      Private63 = 63
-    };
-
-    enum class PacketLengthType : uint8_t {
-      OneOctet = 0,
-      TwoOctet = 1,
-      FiveOctet = 2,
-      FourOctet = 2,
-      Partial = 3,
-      Indeterminate = 3, /* Old Format */
-      Default
-    };
-
-    struct PacketHeader
-    {
-      virtual void write(std::ostream& out) = 0;
-    };
-
-    struct OldPacketHeader : PacketHeader
-    {
-      PacketType m_packet_type;
-      PacketLengthType m_length_type;
-      uint32_t m_length;
-
-      static void verify_length(uint32_t length,
-				PacketLengthType length_type);
-
-      static PacketLengthType best_length_type(uint32_t length);
-
-      OldPacketHeader(PacketType packet_type,
-		      uint32_t length,
-		      PacketLengthType length_type = PacketLengthType::Default);
-
-      void set_packet_type(PacketType packet_type);
-
-      void set_length(uint32_t length,
-		      PacketLengthType length_type = PacketLengthType::Default);
-
-      void write(std::ostream& out);
-    };
-
-    struct NewPacketTag
-    {
-      PacketType m_packet_type;
-
-      void set_packet_type(PacketType packet_type);
-
-      NewPacketTag(PacketType packet_type);
-
-      void write(std::ostream& out);
-    };
-
-    struct NewPacketLength
-    {
-      PacketLengthType m_length_type;
-      uint32_t m_length;
-
-      static void verify_length(uint32_t length,
-				PacketLengthType length_type);
-
-      static PacketLengthType best_length_type(uint32_t length);
-
-      void set_length(uint32_t length,
-		      PacketLengthType length_type = PacketLengthType::Default);
-
-      NewPacketLength(uint32_t length,
-		      PacketLengthType length_type = PacketLengthType::Default);
-
-      void write(std::ostream& out);
-    };
-
-    struct NewPacketHeader : PacketHeader
-    {
-      NewPacketTag m_tag;
-      NewPacketLength m_length;
-
-      NewPacketHeader(NewPacketTag tag,
-		      NewPacketLength length)
-	: m_tag(tag), m_length(length)
-	{
-	}
-
-      NewPacketHeader(PacketType packet_type,
-		      uint32_t length,
-		      PacketLengthType length_type = PacketLengthType::Default)
-	: m_tag(packet_type), m_length(length, length_type)
-	{
-	}
-
-      void write(std::ostream& out);
-    };
-  }
-}
+namespace OpenPGP {
+
+enum class PacketType : uint8_t {
+  Reserved = 0,
+  PublicKeyEncryptedSessionKey = 1,
+  Signature = 2,
+  SymmetricKeyEncryptedSessionKey = 3,
+  OnePassSignature = 4,
+  SecretKey = 5,
+  PublicKey = 6,
+  SecretSubkey = 7,
+  CompressedData = 8,
+  SymmetricallyEncryptedData = 9,
+  Marker = 10,
+  LiteralData = 11,
+  Trust = 12,
+  UserID = 13,
+  PublicSubkey = 14,
+  UserAttribute = 17,
+  SymmetricallyEncryptedAndIntegrityProtectedData = 18,
+  ModificationDetectionCode = 19,
+  Private60 = 60,
+  Private61 = 61,
+  Private62 = 62,
+  Private63 = 63
+};
+
+enum class PacketLengthType : uint8_t {
+  OneOctet = 0,
+  TwoOctet = 1,
+  FiveOctet = 2,
+  FourOctet = 2,
+  Partial = 3,
+  Indeterminate = 3, /* Old Format */
+  Default
+};
+
+struct PacketHeader {
+  virtual void write(std::ostream& out) = 0;
+};
+
+struct OldPacketHeader : PacketHeader {
+  PacketType m_packet_type;
+  PacketLengthType m_length_type;
+  uint32_t m_length;
+
+  static void verify_length(uint32_t length, PacketLengthType length_type);
+
+  static PacketLengthType best_length_type(uint32_t length);
+
+  OldPacketHeader(PacketType packet_type, uint32_t length,
+                  PacketLengthType length_type = PacketLengthType::Default);
+
+  void set_packet_type(PacketType packet_type);
+
+  void set_length(uint32_t length,
+                  PacketLengthType length_type = PacketLengthType::Default);
+
+  void write(std::ostream& out);
+};
+
+struct NewPacketTag {
+  PacketType m_packet_type;
+
+  void set_packet_type(PacketType packet_type);
+
+  NewPacketTag(PacketType packet_type);
+
+  void write(std::ostream& out);
+};
+
+struct NewPacketLength {
+  PacketLengthType m_length_type;
+  uint32_t m_length;
+
+  static void verify_length(uint32_t length, PacketLengthType length_type);
+
+  static PacketLengthType best_length_type(uint32_t length);
+
+  void set_length(uint32_t length,
+                  PacketLengthType length_type = PacketLengthType::Default);
+
+  NewPacketLength(uint32_t length,
+                  PacketLengthType length_type = PacketLengthType::Default);
+
+  void write(std::ostream& out);
+};
+
+struct NewPacketHeader : PacketHeader {
+  NewPacketTag m_tag;
+  NewPacketLength m_length;
+
+  NewPacketHeader(NewPacketTag tag, NewPacketLength length)
+      : m_tag(tag), m_length(length) {}
+
+  NewPacketHeader(PacketType packet_type, uint32_t length,
+                  PacketLengthType length_type = PacketLengthType::Default)
+      : m_tag(packet_type), m_length(length, length_type) {}
+
+  void write(std::ostream& out);
+};
+
+}  // namespace OpenPGP
+}  // namespace NeoPG
 #endif
diff --git a/include/neopg/utils/time.h b/include/neopg/utils/time.h
@@ -10,14 +10,14 @@
 #include <time.h>
 
 #define NEOPG_DLL __attribute__((visibility("default")))
-     
+
 namespace NeoPG {
 
-  /**
-     A replacement for timegm.
-  */
-  time_t NEOPG_DLL timegm(struct tm *tm);
+/**
+   A replacement for timegm.
+*/
+time_t NEOPG_DLL timegm(struct tm *tm);
 
-}
+}  // namespace NeoPG
 
 #endif
diff --git a/src/lib/utils/time.cpp b/src/lib/utils/time.cpp
@@ -1,17 +1,16 @@
-#include "boost/date_time/posix_time/posix_time.hpp"
 #include "boost/date_time/posix_time/conversion.hpp"
+#include "boost/date_time/posix_time/posix_time.hpp"
 
 #include "time.h"
 
 namespace NeoPG {
 
-time_t timegm(struct tm *tm)
-{
+time_t timegm(struct tm *tm) {
   using namespace boost::posix_time;
 
   /* FIXME: Not sure if this does the right thing.  */
   ptime pt = ptime_from_tm(*tm);
   return to_time_t(pt);
 }
 
-}
+}  // namespace NeoPG