gpg: A little clean up.
authorNIIBE Yutaka <gniibe@fsij.org>
Tue, 23 Jul 2019 03:04:21 +0000 (12:04 +0900)
committerNIIBE Yutaka <gniibe@fsij.org>
Tue, 23 Jul 2019 03:04:21 +0000 (12:04 +0900)
* 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
g10/photoid.c
g10/photoid.h

index b07afb1..8655919 100644 (file)
@@ -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"
index f9720d3..6d7ef7c 100644 (file)
@@ -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)
     {
index fc7ec6f..bbf1f49 100644 (file)
@@ -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);