[Pkg-gnupg-commit] [gnupg2] 185/205: gpg: Fix const char pointer mismatch with gettext.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 920b1421b35d1404b8360bd8feac0be659840543
Author: Werner Koch <wk at gnupg.org>
Date:   Wed May 4 14:40:16 2016 +0200

    gpg: Fix const char pointer mismatch with gettext.
    
    * g10/tofu.c (get_trust): Use const char *.
    
    Signed-off-by: Werner Koch <wk at gnupg.org>
---
 g10/tofu.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/g10/tofu.c b/g10/tofu.c
index 5213e03..e591aa5 100644
--- a/g10/tofu.c
+++ b/g10/tofu.c
@@ -2101,7 +2101,8 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
 	/* TRANSLATORS: Please translate the text found in the source
 	   file below.  We don't directly internationalize that text
 	   so that we can tweak it without breaking translations.  */
-	char *text = _("TOFU detected a binding conflict");
+	const char *text = _("TOFU detected a binding conflict");
+        char *textbuf;
 	if (strcmp (text, "TOFU detected a binding conflict") == 0)
 	  /* No translation.  Use the English text.  */
 	  text =
@@ -2111,9 +2112,9 @@ get_trust (struct dbs *dbs, const char *fingerprint, const char *email,
 	    "Alternatively, a new key may indicate a man-in-the-middle "
 	    "attack!  Before accepting this key, you should talk to or "
 	    "call the person to make sure this new key is legitimate.";
-        text = format_text (text, 0, 72, 80);
+        textbuf = format_text (text, 0, 72, 80);
 	es_fprintf (fp, "\n%s\n", text);
-        xfree (text);
+        xfree (textbuf);
       }
 
     es_fputc ('\n', fp);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git