X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgppubring.c;h=d7e56120a6c5d82904fac28881733ec612d499f7;hp=bb27da14fa252e259d4127f5560c148c3b0263f0;hb=9f1dbdb74d7ca296eaa5fcf45243f7e376d35eab;hpb=93b012884de4ca5e1f2550f767d0b8680b9c0e9f

diff --git a/pgppubring.c b/pgppubring.c
index bb27da1..d7e5612 100644
--- a/pgppubring.c
+++ b/pgppubring.c
@@ -22,32 +22,22 @@
  *
  */
 
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
 
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
 #include <lib-hash/hash.h>
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <time.h>
 #ifdef HAVE_GETOPT_H
 # include <getopt.h>
 #else
 extern char *optarg;
 extern int optind;
 #endif
-#include <errno.h>
 
 short Umask;   /* dirty hack because we need Umask in lib.c but don't want globals.h there */
 
 #include "lib.h"
-#include "pgplib.h"
-#include "pgppacket.h"
+#include <lib-crypt/pgplib.h>
+#include <lib-crypt/pgppacket.h>
 
 #define MD5_DIGEST_LENGTH  16
 
@@ -783,9 +773,7 @@ static void pgpring_find_candidates (char *ringfile, const char *hints[],
 
     FGETPOS (rfp, pos);
   }
-
-  fclose (rfp);
-
+  m_fclose(&rfp);
 }
 
 static void print_userid (const char *id)
@@ -908,13 +896,3 @@ static void pgpring_dump_keyblock (pgp_key_t p)
     }
   }
 }
-
-/*
- * The mutt_gettext () defined in gettext.c requires iconv,
- * so we do without charset conversion here.
- */
-
-char *mutt_gettext (const char *message)
-{
-  return (char *) message;
-}