security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00
Code Activity

gpg: A little clean up.

Browse Source 
* 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>
This commit is contained in:
NIIBE Yutaka 2019-07-23 12:04:21 +09:00
parent 13bc0431ff
commit 7bfbb9fa7e
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
g10/keyserver.c
View File

@ -31,7 +31,6 @@
#include "filter.h" #include "filter.h"
#include "keydb.h" #include "keydb.h"
#include "../common/status.h" #include "../common/status.h"
#include "exec.h"
#include "main.h" #include "main.h"
#include "../common/i18n.h" #include "../common/i18n.h"
#include "../common/ttyio.h" #include "../common/ttyio.h"

5
g10/photoid.c
View 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). make sure it is not too big (see parse-packet.c:parse_attribute).
Extensions should be 3 characters long for the best cross-platform Extensions should be 3 characters long for the best cross-platform
compatibility. */ 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) switch(type)
{ {

2
g10/photoid.h
View File

@ -27,7 +27,7 @@
PKT_user_id *generate_photo_id (ctrl_t ctrl, PKT_user_id *generate_photo_id (ctrl_t ctrl,
PKT_public_key *pk,const char *filename); PKT_public_key *pk,const char *filename);
int parse_image_header(const struct user_attribute *attr,byte *type,u32 *len); 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, void show_photos (ctrl_t ctrl, const struct user_attribute *attrs, int count,
PKT_public_key *pk, PKT_user_id *uid); PKT_public_key *pk, PKT_user_id *uid);