[gmime/gmime-2-4] Renamed a few things to make them clearer



commit d634c721a5dce4707fe009d52bba2fc663c832ea
Author: Jeffrey Stedfast <fejj gnome org>
Date:   Mon Mar 7 12:07:37 2011 -0500

    Renamed a few things to make them clearer

 gmime/gmime-gpg-context.c |   22 +++++++++++-----------
 1 files changed, 11 insertions(+), 11 deletions(-)
---
diff --git a/gmime/gmime-gpg-context.c b/gmime/gmime-gpg-context.c
index 406c384..34e5247 100644
--- a/gmime/gmime-gpg-context.c
+++ b/gmime/gmime-gpg-context.c
@@ -826,17 +826,17 @@ next_token (char *in, char **token)
 }
 
 /**
- * gpg_ctx_new_signer:
+ * gpg_ctx_add_signer:
  * @gpg: GnuPG context
- * @status: status message
+ * @info: a string with the signer's info
  *
  * Parses GOODSIG, BADSIG, EXPSIG, EXPKEYSIG, and REVKEYSIG status messages
  * into a newly allocated #GMimeSigner, adding it to @gpg's signer list.
  *
- * Returns: the newly allocated signer for the caller to add more info to.
+ * Returns: the newly added signer for the caller to add more info to.
  **/
 static GMimeSigner *
-gpg_ctx_new_signer (struct _GpgCtx *gpg, char *status)
+gpg_ctx_add_signer (struct _GpgCtx *gpg, char *info)
 {
 	GMimeSigner *signer;
 	
@@ -845,10 +845,10 @@ gpg_ctx_new_signer (struct _GpgCtx *gpg, char *status)
 	gpg->signer = signer;
 	
 	/* get the key id of the signer */
-	status = next_token (status, &signer->keyid);
+	info = next_token (info, &signer->keyid);
 	
 	/* the rest of the string is the signer's name */
-	signer->name = g_strdup (status);
+	signer->name = g_strdup (info);
 	
 	return signer;
 }
@@ -861,19 +861,19 @@ gpg_ctx_parse_signer_info (struct _GpgCtx *gpg, char *status)
 	if (!strncmp (status, "SIG_ID ", 7)) {
 		/* not sure if this contains anything we care about... */
 	} else if (!strncmp (status, "GOODSIG ", 8)) {
-		signer = gpg_ctx_new_signer (gpg, status + 8);
+		signer = gpg_ctx_add_signer (gpg, status + 8);
 		gpg->goodsig = TRUE;
 	} else if (!strncmp (status, "BADSIG ", 7)) {
-		signer = gpg_ctx_new_signer (gpg, status + 7);
+		signer = gpg_ctx_add_signer (gpg, status + 7);
 		gpg->badsig = TRUE;
 	}  else if (!strncmp (status, "EXPSIG ", 7)) {
-		signer = gpg_ctx_new_signer (gpg, status + 7);
+		signer = gpg_ctx_add_signer (gpg, status + 7);
 		signer->errors |= GMIME_SIGNER_ERROR_EXPSIG;
 	} else if (!strncmp (status, "EXPKEYSIG ", 10)) {
-		signer = gpg_ctx_new_signer (gpg, status + 10);
+		signer = gpg_ctx_add_signer (gpg, status + 10);
 		signer->errors |= GMIME_SIGNER_ERROR_EXPKEYSIG;
 	} else if (!strncmp (status, "REVKEYSIG ", 10)) {
-		signer = gpg_ctx_new_signer (gpg, status + 10);
+		signer = gpg_ctx_add_signer (gpg, status + 10);
 		signer->errors |= GMIME_SIGNER_ERROR_REVKEYSIG;
 	} else if (!strncmp (status, "ERRSIG ", 7)) {
 		/* Note: NO_PUBKEY often comes after an ERRSIG */



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]