From 942193e88bcc3c0eaf13cd780900999a519e01b6 Mon Sep 17 00:00:00 2001
From: clubby789 <jamie@hill-daniel.co.uk>
Date: Thu, 16 Jun 2022 12:49:04 +0100
Subject: [PATCH] Style changes

---
 pyc_module.cpp | 78 +++++++++++++++++++++++++-------------------------
 pycdas.cpp     |  4 +--
 pycdc.cpp      |  4 +--
 3 files changed, 43 insertions(+), 43 deletions(-)

diff --git a/pyc_module.cpp b/pyc_module.cpp
index 152c0df..06bf31c 100644
--- a/pyc_module.cpp
+++ b/pyc_module.cpp
@@ -202,7 +202,8 @@ void PycModule::loadFromFile(const char* filename)
     m_code = LoadObject(&in, this).require_cast<PycCode>();
 }
 
-void PycModule::loadFromMarshalledFile(const char* filename, int major, int minor) {
+void PycModule::loadFromMarshalledFile(const char* filename, int major, int minor)
+{
     PycFile in (filename);
     if (!in.isOpen()) {
         fprintf(stderr, "Error opening file %s\n", filename);
@@ -214,8 +215,6 @@ void PycModule::loadFromMarshalledFile(const char* filename, int major, int mino
         return;
     }
     setVersion(magic);
-    m_maj = major;
-    m_min = minor;
     m_code = LoadObject(&in, this).require_cast<PycCode>();
 }
 
@@ -248,47 +247,48 @@ PycRef<PycObject> PycModule::getRef(int ref) const
 #define enumVariant(mj, mn) case mn: \
     return PycMagic::MAGIC_ ## mj ## _ ## mn
 
-PycMagic version_to_magic(int major, int minor) {
+PycMagic version_to_magic(int major, int minor)
+{
     switch (major) {
-        case 1:
+    case 1:
         switch (minor) {
-            enumVariant(1, 0);
-            case 1:
-            case 2:
-            return PycMagic::MAGIC_1_1;
-            enumVariant(1, 3);
-            enumVariant(1, 4);
-            enumVariant(1, 5);
-            enumVariant(1, 6);
-            default: return PycMagic::INVALID;
-        }
+        enumVariant(1, 0);
+        case 1:
         case 2:
-            switch (minor) {
-            enumVariant(2, 0);
-            enumVariant(2, 1);
-            enumVariant(2, 3);
-            enumVariant(2, 4);
-            enumVariant(2, 5);
-            enumVariant(2, 6);
-            enumVariant(2, 7);
-            default: return PycMagic::INVALID;
+        return PycMagic::MAGIC_1_1;
+        enumVariant(1, 3);
+        enumVariant(1, 4);
+        enumVariant(1, 5);
+        enumVariant(1, 6);
+        default: return PycMagic::INVALID;
         }
-        case 3:
-            switch (minor) {
-            enumVariant(3, 0);
-            enumVariant(3, 1);
-            enumVariant(3, 3);
-            enumVariant(3, 4);
-            enumVariant(3, 5);
-            enumVariant(3, 6);
-            enumVariant(3, 7);
-            enumVariant(3, 8);
-            enumVariant(3, 9);
-            enumVariant(3, 10);
-            default: return PycMagic::INVALID;
+    case 2:
+        switch (minor) {
+        enumVariant(2, 0);
+        enumVariant(2, 1);
+        enumVariant(2, 3);
+        enumVariant(2, 4);
+        enumVariant(2, 5);
+        enumVariant(2, 6);
+        enumVariant(2, 7);
+        default: return PycMagic::INVALID;
+        }
+    case 3:
+        switch (minor) {
+        enumVariant(3, 0);
+        enumVariant(3, 1);
+        enumVariant(3, 3);
+        enumVariant(3, 4);
+        enumVariant(3, 5);
+        enumVariant(3, 6);
+        enumVariant(3, 7);
+        enumVariant(3, 8);
+        enumVariant(3, 9);
+        enumVariant(3, 10);
+        default: return PycMagic::INVALID;
         }
         default:
             return PycMagic::INVALID;
-        }
     }
-#undef enumVariant
\ No newline at end of file
+}
+#undef enumVariant
diff --git a/pycdas.cpp b/pycdas.cpp
index 3f93104..40333b7 100644
--- a/pycdas.cpp
+++ b/pycdas.cpp
@@ -264,7 +264,7 @@ int main(int argc, char* argv[])
             fputs("Options:\n", stderr);
             fputs("  -o <filename>  Write output to <filename> (default: stdout)\n", stderr);
             fputs("  -c             Specify loading a compiled code object. Requires the version to be set\n", stderr);
-            fputs("  -v <x.y>       Specify a Python version\n", stderr);
+            fputs("  -v <x.y>       Specify a Python version for loading a compiled code object\n", stderr);
             fputs("  --help         Show this help text and then exit\n", stderr);
             return 0;
         } else {
@@ -293,7 +293,7 @@ int main(int argc, char* argv[])
         std::string s(version);
         auto dot = s.find('.');
         if (dot == std::string::npos || dot == s.size()-1) {
-            fputs("Unable to read version string (use the format x.y)\n", stderr);
+            fputs("Unable to parse version string (use the format x.y)\n", stderr);
             return 1;
         }
         int major = std::stoi(s.substr(0, dot));
diff --git a/pycdc.cpp b/pycdc.cpp
index 103ee4f..a114a3f 100644
--- a/pycdc.cpp
+++ b/pycdc.cpp
@@ -41,7 +41,7 @@ int main(int argc, char* argv[])
             fputs("Options:\n", stderr);
             fputs("  -o <filename>  Write output to <filename> (default: stdout)\n", stderr);
             fputs("  -c             Specify loading a compiled code object. Requires the version to be set\n", stderr);
-            fputs("  -v <x.y>       Specify a Python version\n", stderr);
+            fputs("  -v <x.y>       Specify a Python version for loading a compiled code object\n", stderr);
             fputs("  --help         Show this help text and then exit\n", stderr);
             return 0;
         } else {
@@ -70,7 +70,7 @@ int main(int argc, char* argv[])
         std::string s(version);
         auto dot = s.find('.');
         if (dot == std::string::npos || dot == s.size()-1) {
-            fputs("Unable to read version string (use the format x.y)\n", stderr);
+            fputs("Unable to parse version string (use the format x.y)\n", stderr);
             return 1;
         }
         int major = std::stoi(s.substr(0, dot));