gpg: Minor restructuring of a function.

--

This is for easier reading and future changing.

(cherry picked from commit d984de172c)

g10/getkey.c

@@ -3884,37 +3884,44 @@ lookup (ctrl_t ctrl, getkey_ctx_t ctx, int want_secret,
 }
 
 
+/* If a default key has been specified, return that key.  If a card
+ * based key is also available as indicated by FPR_CARD not being
+ * NULL, return that key if suitable.  */
 gpg_error_t
 get_seckey_default_or_card (ctrl_t ctrl, PKT_public_key *pk,
                             const byte *fpr_card, size_t fpr_len)
 {
   gpg_error_t err;
   strlist_t namelist = NULL;
+  const char *def_secret_key;
 
-  const char *def_secret_key = parse_def_secret_key (ctrl);
+  def_secret_key = parse_def_secret_key (ctrl);
 
   if (def_secret_key)
     add_to_strlist (&namelist, def_secret_key);
   else if (fpr_card)
     {
-      int rc = get_pubkey_byfprint (ctrl, pk, NULL, fpr_card, fpr_len);
+      err = get_pubkey_byfprint (ctrl, pk, NULL, fpr_card, fpr_len);
 
       /* The key on card can be not suitable for requested usage.  */
-      if (rc == GPG_ERR_UNUSABLE_PUBKEY)
+      if (gpg_err_code (err) == GPG_ERR_UNUSABLE_PUBKEY)
         fpr_card = NULL;        /* Fallthrough as no card.  */
       else
-        return rc;
+        return err;  /* Success or other error.  */
     }
 
-  if (!fpr_card
+  if (!fpr_card || (def_secret_key && *def_secret_key
-      || (def_secret_key && def_secret_key[strlen (def_secret_key)-1] == '!'))
+                    && def_secret_key[strlen (def_secret_key)-1] == '!'))
+    {
       err = key_byname (ctrl, NULL, namelist, pk, 1, 0, NULL, NULL);
+    }
   else
     { /* Default key is specified and card key is also available.  */
       kbnode_t k, keyblock = NULL;
 
       err = key_byname (ctrl, NULL, namelist, pk, 1, 0, &keyblock, NULL);
-      if (!err)
+      if (err)
+        goto leave;
       for (k = keyblock; k; k = k->next)
         {
           PKT_public_key *pk_candidate;
@@ -3940,10 +3947,12 @@ get_seckey_default_or_card (ctrl_t ctrl, PKT_public_key *pk,
       release_kbnode (keyblock);
     }
 
+ leave:
   free_strlist (namelist);
-
   return err;
 }
+
+
 
 /*********************************************
  ***********  User ID printing helpers *******

g10/sign.c

@@ -905,18 +905,17 @@ write_signature_packets (ctrl_t ctrl,
 }
 
 
-/****************
+/* Sign the files whose names are in FILENAME using all secret keys
- * Sign the files whose names are in FILENAME.
+ * which can be taken from LOCUSR, if this is NULL, use the default
- * If DETACHED has the value true,
+ * secret key.
- * make a detached signature.  If FILENAMES->d is NULL read from stdin
+ * If DETACHED has the value true, make a detached signature.
- * and ignore the detached mode.  Sign the file with all secret keys
+ * If FILENAMES->d is NULL read from stdin and ignore the detached mode.
- * which can be taken from LOCUSR, if this is NULL, use the default one
+ * If ENCRYPTFLAG is true, use REMUSER (or ask if it is NULL) to
- * If ENCRYPTFLAG is true, use REMUSER (or ask if it is NULL) to encrypt the
+ * encrypt the signed data for these users.  If ENCRYPTFLAG is 2
- * signed data for these users.  If ENCRYPTFLAG is 2 symmetric encryption
+ * symmetric encryption is also used.
- * is also used.
+ * If OUTFILE is not NULL; this file is used for output and the
- * If OUTFILE is not NULL; this file is used for output and the function
+ * function does not ask for overwrite permission; output is then
- * does not ask for overwrite permission; output is then always
+ * always uncompressed, non-armored and in binary mode.
- * uncompressed, non-armored and in binary mode.
  */
 int
 sign_file (ctrl_t ctrl, strlist_t filenames, int detached, strlist_t locusr,