From 7bfbb9fa7e7693cd7f19a8d130aa0a9a82825d5d Mon Sep 17 00:00:00 2001
From: NIIBE Yutaka <gniibe@fsij.org>
Date: Tue, 23 Jul 2019 12:04:21 +0900
Subject: [PATCH] gpg: A little clean up.

* g10/keyserver.c: Don't include exec.h.
* g10/photoid.c (image_type_to_string): It's constant.
* g10/photoid.h (image_type_to_string): Likewise.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
---
 g10/keyserver.c | 1 -
 g10/photoid.c   | 5 +++--
 g10/photoid.h   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/g10/keyserver.c b/g10/keyserver.c
index b07afb128..8655919a0 100644
--- a/g10/keyserver.c
+++ b/g10/keyserver.c
@@ -31,7 +31,6 @@
 #include "filter.h"
 #include "keydb.h"
 #include "../common/status.h"
-#include "exec.h"
 #include "main.h"
 #include "../common/i18n.h"
 #include "../common/ttyio.h"
diff --git a/g10/photoid.c b/g10/photoid.c
index f9720d329..6d7ef7cba 100644
--- a/g10/photoid.c
+++ b/g10/photoid.c
@@ -233,9 +233,10 @@ int parse_image_header(const struct user_attribute *attr,byte *type,u32 *len)
    make sure it is not too big (see parse-packet.c:parse_attribute).
    Extensions should be 3 characters long for the best cross-platform
    compatibility. */
-char *image_type_to_string(byte type,int style)
+const char *
+image_type_to_string(byte type,int style)
 {
-  char *string;
+  const char *string;
 
   switch(type)
     {
diff --git a/g10/photoid.h b/g10/photoid.h
index fc7ec6fbc..bbf1f493e 100644
--- a/g10/photoid.h
+++ b/g10/photoid.h
@@ -27,7 +27,7 @@
 PKT_user_id *generate_photo_id (ctrl_t ctrl,
                                 PKT_public_key *pk,const char *filename);
 int parse_image_header(const struct user_attribute *attr,byte *type,u32 *len);
-char *image_type_to_string(byte type,int style);
+const char *image_type_to_string(byte type,int style);
 void show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count,
                   PKT_public_key *pk, PKT_user_id *uid);