Remove dead store in generic_fetch_key

[onak.git] / splitkeys.c

diff --git a/splitkeys.c b/splitkeys.c
index fdc20a288dfb1250a5ce218ab647714fc495d98d..1f0e9d68df929a1a1179a309c146df292d00e948 100644 (file)
--- a/splitkeys.c
+++ b/splitkeys.c
@@ -13,8 +13,7 @@
  * more details.
  *
  * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 51
- * Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ * this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
 #include <fcntl.h>
@@ -25,9 +24,7 @@
 
 #include "charfuncs.h"
 #include "keystructs.h"
-#include "log.h"
 #include "mem.h"
-#include "onak-conf.h"
 #include "openpgp.h"
 #include "parsekey.h"
 
@@ -36,7 +33,6 @@ int main(int argc, char *argv[])
        struct openpgp_packet_list      *packets = NULL;
        struct openpgp_packet_list      *list_end = NULL;
        struct openpgp_packet_list      *tmp = NULL;
-       int                              result = 0;
        int                              maxkeys = 10000;
        int                              outfd = -1;
        int                              count = 0;
@@ -52,11 +48,8 @@ int main(int argc, char *argv[])
                }
        }
 
-       readconfig(NULL);
-       initlogthing("splitkeys", config.logfile);
-
        do {
-               result = read_openpgp_stream(stdin_getchar, NULL,
+               read_openpgp_stream(stdin_getchar, NULL,
                                 &packets, maxkeys);
                if (packets != NULL) {
                        list_end = packets;
@@ -69,7 +62,7 @@ int main(int argc, char *argv[])
                                        tmp->next = NULL;
                                }
                        }
-                       if (tmp->next != NULL) {
+                       if (tmp != NULL && tmp->next != NULL) {
                                list_end = NULL;
                        }
 
@@ -84,8 +77,5 @@ int main(int argc, char *argv[])
                }
        } while (packets != NULL);
 
-       cleanuplogthing();
-       cleanupconfig();
-
        return 0;
 }