jtag/core: get rid of variable 'jtag'

[fw/openocd] / src / helper / configuration.c

diff --git a/src/helper/configuration.c b/src/helper/configuration.c
index 114ad2c6c90e6f47ee591d61becdbd92a15304d8..7e791d08489740782175e47487ca2775557501f9 100644 (file)
--- a/src/helper/configuration.c
+++ b/src/helper/configuration.c
@@ -18,12 +18,14 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program.  If not, see <http://www.gnu.org/licenses/>. *
  ***************************************************************************/
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include "configuration.h"
 #include "log.h"
+#include "replacements.h"
 
 static size_t num_config_files;
 static char **config_file_names;
@@ -109,7 +111,7 @@ FILE *open_file_from_path(const char *file, const char *mode)
                return fopen(file, mode);
        else {
                char *full_path = find_file(file);
-               if (full_path == NULL)
+               if (!full_path)
                        return NULL;
                FILE *fp = NULL;
                fp = fopen(full_path, mode);
@@ -148,12 +150,12 @@ char *get_home_dir(const char *append_path)
 {
        char *home = getenv("HOME");
 
-       if (home == NULL) {
+       if (!home) {
 
 #ifdef _WIN32
                home = getenv("USERPROFILE");
 
-               if (home == NULL) {
+               if (!home) {
 
                        char homepath[MAX_PATH];
                        char *drive = getenv("HOMEDRIVE");
@@ -171,7 +173,7 @@ char *get_home_dir(const char *append_path)
 #endif
        }
 
-       if (home == NULL)
+       if (!home)
                return home;
 
        char *home_path;