mailsplit.c: remove dead code

This was found by coverity. (Id: 290001)

The variable 'output' is assigned to a value
after all gotos to the corrupt label.

Remove the goto by moving the errorhandling code to the
condition, which detects the error.

Signed-off-by: Stefan Beller <stefanbeller@gmail.com>
Helped-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/mailsplit.c b/builtin/mailsplit.c
index 06296d4bdf607431bfcb38f0bc6720f555d6917a..763cda098cf1e2ac2ccbae45d3602f8bb1093be0 100644 (file)
--- a/builtin/mailsplit.c
+++ b/builtin/mailsplit.c
@@ -53,14 +53,16 @@ static int keep_cr;
  */
 static int split_one(FILE *mbox, const char *name, int allow_bare)
 {
  */
 static int split_one(FILE *mbox, const char *name, int allow_bare)
 {

-       FILE *output = NULL;
+       FILE *output;

        int fd;
        int status = 0;
        int is_bare = !is_from_line(buf.buf, buf.len);
 
        int fd;
        int status = 0;
        int is_bare = !is_from_line(buf.buf, buf.len);
 

-       if (is_bare && !allow_bare)
-               goto corrupt;
-
+       if (is_bare && !allow_bare) {
+               unlink(name);
+               fprintf(stderr, "corrupt mailbox\n");
+               exit(1);
+       }

        fd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0666);
        if (fd < 0)
                die_errno("cannot open output file '%s'", name);
        fd = open(name, O_WRONLY | O_CREAT | O_EXCL, 0666);
        if (fd < 0)
                die_errno("cannot open output file '%s'", name);


@@ -91,13 +93,6 @@ static int split_one(FILE *mbox, const char *name, int allow_bare)
        }
        fclose(output);
        return status;
        }
        fclose(output);
        return status;

-
- corrupt:
-       if (output)
-               fclose(output);
-       unlink(name);
-       fprintf(stderr, "corrupt mailbox\n");
-       exit(1);

 }
 
 static int populate_maildir_list(struct string_list *list, const char *path)
 }
 
 static int populate_maildir_list(struct string_list *list, const char *path)