From 6ef157baa026660fba78ae28400da692e18dc3a4 Mon Sep 17 00:00:00 2001
From: Nocturn9x <hackhab@gmail.com>
Date: Thu, 2 Dec 2021 21:28:58 +0100
Subject: [PATCH] Minor fixes + removed redundant SIGINT hook

---
 src/main.nim         | 1 -
 src/util/disks.nim   | 3 +--
 src/util/logging.nim | 2 +-
 src/util/misc.nim    | 4 ----
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main.nim b/src/main.nim
index 017fb4d..e75d120 100644
--- a/src/main.nim
+++ b/src/main.nim
@@ -47,7 +47,6 @@ proc main(logger: Logger) =
 
 
 when isMainModule:
-    setControlCHook(handleControlC)
     var logger = getDefaultLogger()
     var optParser = initOptParser(commandLineParams())
     for kind, key, value in optParser.getopt():
diff --git a/src/util/disks.nim b/src/util/disks.nim
index ac0a2a4..97a20d0 100644
--- a/src/util/disks.nim
+++ b/src/util/disks.nim
@@ -170,7 +170,6 @@ proc mountRealDisks*(logger: Logger, fstab: string = "/etc/fstab") =
 proc mountVirtualDisks*(logger: Logger) =
     ## Mounts POSIX virtual filesystems/partitions,
     ## such as /proc and /sys
-    
     var retcode = 0
     for entry in virtualFileSystems:
         if checkDisksIsMounted(entry):
@@ -213,7 +212,7 @@ proc unmountAllDisks*(logger: Logger, code: int) =
                 continue
             logger.debug(&"Unmounting filesystem {entry.source} ({entry.filesystemtype}) from {entry.target}")
             logger.trace(&"Calling umount2('{entry.target}', MNT_DETACH)")
-            var retcode = umount2(entry.target, 2)   # 2 = MNT_DETACH - Since we're shutting down, we need the disks to be *gone*!
+            retcode = umount2(entry.target, 2)   # 2 = MNT_DETACH - Since we're shutting down, we need the disks to be *gone*!
             logger.trace(&"umount2('{entry.target}', MNT_DETACH) returned {retcode}")
             if retcode == -1:
                 logger.error(&"Unmounting disk {entry.source} from {entry.target} has failed with error {posix.errno}: {posix.strerror(posix.errno)}")
diff --git a/src/util/logging.nim b/src/util/logging.nim
index 23f22ab..338a104 100644
--- a/src/util/logging.nim
+++ b/src/util/logging.nim
@@ -122,4 +122,4 @@ proc getDefaultLogger*(): Logger =
     result.addHandler(createHandler(logWarning, LogLevel.Warning))
     result.addHandler(createHandler(logError, LogLevel.Error))
     result.addHandler(createHandler(logCritical, LogLevel.Critical))
-    result.addHandler(createHandler(logFatal, LogLevel.Fatal))
\ No newline at end of file
+    result.addHandler(createHandler(logFatal, LogLevel.Fatal))
diff --git a/src/util/misc.nim b/src/util/misc.nim
index 617e3a2..2e1dc9d 100644
--- a/src/util/misc.nim
+++ b/src/util/misc.nim
@@ -86,8 +86,4 @@ proc setHostname*(logger: Logger): string =
 proc sleepSeconds*(amount: SomeInteger) = sleep(amount * 1000)
 
 
-proc handleControlC* {.noconv.} =
-    raise newException(CtrlCException, "Interrupted by Ctrl+C")
-
-
 proc strsignal*(sig: cint): cstring {.header:"string.h", importc.}