From b32d6fc8617bb75cd81a3e0f7a8be3c0637e10bf Mon Sep 17 00:00:00 2001
From: Heiko Reese <heiko.reese@kit.edu>
Date: Sun, 12 Sep 2021 22:06:09 +0200
Subject: [PATCH] Fixed complaints from Jetbrains Clion :-)

---
 src/libexim-encrypt-dlfunc-decrypt-sealedbox.c | 3 +--
 src/libexim-encrypt-dlfunc-decrypt-secretbox.c | 3 +--
 src/libexim-encrypt-dlfunc.c                   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/libexim-encrypt-dlfunc-decrypt-sealedbox.c b/src/libexim-encrypt-dlfunc-decrypt-sealedbox.c
index fc36a58..1c79222 100644
--- a/src/libexim-encrypt-dlfunc-decrypt-sealedbox.c
+++ b/src/libexim-encrypt-dlfunc-decrypt-sealedbox.c
@@ -46,7 +46,7 @@ typedef enum {
 
 int main(int argc, char *argv[]) {
     char *prog_basename = basename(argv[0]);
-    int opt = 0;
+    int opt;
     unsigned char *secretkey, *publickey;
     size_t secretkey_len = 0, publickey_len = 0;
     char *b64cipherstring;
@@ -133,7 +133,6 @@ int main(int argc, char *argv[]) {
             case 'h':
                 print_usage(prog_basename);
                 exit(EXIT_SUCCESS);
-                break;
         }
     }
 
diff --git a/src/libexim-encrypt-dlfunc-decrypt-secretbox.c b/src/libexim-encrypt-dlfunc-decrypt-secretbox.c
index 7effde7..526d204 100644
--- a/src/libexim-encrypt-dlfunc-decrypt-secretbox.c
+++ b/src/libexim-encrypt-dlfunc-decrypt-secretbox.c
@@ -91,7 +91,6 @@ int main(int argc, char *argv[]) {
             case 'h':
                 print_usage(prog_basename);
                 exit(EXIT_SUCCESS);
-                break;
         }
     }
 
@@ -129,7 +128,7 @@ int main(int argc, char *argv[]) {
     if (base64_decode_string(cipherstring, &ciphertext, &ciphertext_len) != 0) {
         fprintf(stderr, "[ERROR] Unable to base64-decode ciphertext.\n\n");
         exit(EXIT_FAILURE);
-    };
+    }
 
     // extract nonce
     unsigned char nonce[crypto_secretbox_NONCEBYTES];
diff --git a/src/libexim-encrypt-dlfunc.c b/src/libexim-encrypt-dlfunc.c
index 26b7967..97cf92d 100644
--- a/src/libexim-encrypt-dlfunc.c
+++ b/src/libexim-encrypt-dlfunc.c
@@ -64,7 +64,7 @@ int sodium_crypto_secretbox_encrypt_password(uschar **yield, int argc, uschar *a
 
     /*
      * Derive a key from the password using a generic hash.
-     * This operations needs to be fast (exim holds no state, this might be called multiple times per email).
+     * This operation needs to be fast (exim holds no state, this might be called multiple times per email).
      * Collisions avoidance or brute force attacks are not a concern here.
      */
     unsigned char keybytes[crypto_secretbox_KEYBYTES];