From b5cb32f979a80904ea58fc7531e43e2be2270573 Mon Sep 17 00:00:00 2001
From: Werner Koch <wk@gnupg.org>
Date: Mon, 16 Mar 2015 08:34:57 +0100
Subject: Remove useless conditions.

* src/estream.c (fname_set_internal): Remove useless condition.
* src/mkheader.c (main): Ditto.
--

Detected by Stack 0.3.
---
 src/estream.c  | 9 +++------
 src/mkheader.c | 2 +-
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/estream.c b/src/estream.c
index 42609ee..3c7d05f 100644
--- a/src/estream.c
+++ b/src/estream.c
@@ -4347,12 +4347,9 @@ fname_set_internal (estream_t stream, const char *fname, int quote)
     quote = !!quote;
 
   stream->intern->printable_fname = mem_alloc (strlen (fname) + quote + 1);
-  if (fname)
-    {
-      if (quote)
-        stream->intern->printable_fname[0] = '\\';
-      strcpy (stream->intern->printable_fname+quote, fname);
-    }
+  if (quote)
+    stream->intern->printable_fname[0] = '\\';
+  strcpy (stream->intern->printable_fname+quote, fname);
 }
 
 
diff --git a/src/mkheader.c b/src/mkheader.c
index 3481771..380c7e3 100644
--- a/src/mkheader.c
+++ b/src/mkheader.c
@@ -606,7 +606,7 @@ main (int argc, char **argv)
           putchar ('@');
           fputs (p2, stdout);
         }
-      else if (p2 && *p2)
+      else if (*p2)
         {
           fputs (p2, stdout);
         }
-- 
cgit v1.2.3