server/keymgmt.c (kh_reopen): Promote the happy path.

[tripe] / server / keymgmt.c

diff --git a/server/keymgmt.c b/server/keymgmt.c
index 7386408..00c3295 100644 (file)
--- a/server/keymgmt.c
+++ b/server/keymgmt.c
@@ -279,14 +279,13 @@ static int kh_reopen(keyhalf *kh)
           "io-error", "?ERRNO", A_END);
     DESTROY(kf);
     return (-1);
-  } else {
-    if (kh->kf) {
-      key_close(kh->kf);
-      DESTROY(kh->kf);
-    }
-    kh->kf = kf;
-    return (0);
   }
+  if (kh->kf) {
+    key_close(kh->kf);
+    DESTROY(kh->kf);
+  }
+  kh->kf = kf;
+  return (0);
 }
 
 /* --- @kh_init@ --- *