From bc20d2e174a0eb7869a3592c39d0a41dbe5fe36d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20Courr=C3=A8ges-Anglas?= Date: Sun, 12 Jun 2016 08:10:57 +0200 Subject: Simplify config file open checks --- src/main.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/src/main.c b/src/main.c index 11d7ca0..3ca8ee6 100644 --- a/src/main.c +++ b/src/main.c @@ -441,12 +441,10 @@ read_startup_files (const char *alt_rcfile) else { filename = xsprintf ("%s/.ratpoisonrc", homedir); - if ((fileptr = fopen (filename, "r")) == NULL) - { - if (errno != ENOENT) - PRINT_ERROR (("ratpoison: could not open %s (%s)\n", - filename, strerror (errno))); - } + fileptr = fopen (filename, "r"); + if (fileptr == NULL && errno != ENOENT) + PRINT_ERROR (("ratpoison: could not open %s (%s)\n", + filename, strerror (errno))); free (filename); } @@ -455,12 +453,10 @@ read_startup_files (const char *alt_rcfile) /* couldn't open $HOME/.ratpoisonrc, fall back on system config */ filename = xsprintf ("%s/ratpoisonrc", SYSCONFDIR); - if ((fileptr = fopen (filename, "r")) == NULL) - { - if (errno != ENOENT) - PRINT_ERROR (("ratpoison: could not open %s (%s)\n", - filename, strerror (errno))); - } + fileptr = fopen (filename, "r"); + if (fileptr == NULL && errno != ENOENT) + PRINT_ERROR (("ratpoison: could not open %s (%s)\n", + filename, strerror (errno))); free (filename); } } -- cgit v1.2.3