cppcheck: don't check NULL pointer before freeing them

[lttng-tools.git] / src / bin / lttng / conf.c

diff --git a/src/bin/lttng/conf.c b/src/bin/lttng/conf.c
index 00991b08195319f58f3d5489ff10ed679204f8aa..c1bfcfd45b8d87eacfae6d3be878033121ee85cc 100644 (file)
--- a/src/bin/lttng/conf.c
+++ b/src/bin/lttng/conf.c
@@ -2,9 +2,8 @@
  * Copyright (c)  2011 David Goulet <david.goulet@polymtl.ca>
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * as published by the Free Software Foundation; only version 2
- * of the License.
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -30,10 +29,8 @@
 #include "conf.h"
 
 /*
- *  config_get_file_path
- *
- *  Returns the path with '/CONFIG_FILENAME' added to it;
- *  path will be NULL if an error occurs.
+ * Returns the path with '/CONFIG_FILENAME' added to it;
+ * path will be NULL if an error occurs.
  */
 char *config_get_file_path(char *path)
 {
@@ -49,10 +46,8 @@ char *config_get_file_path(char *path)
 }
 
 /*
- *  open_config
- *
- *  Returns an open FILE pointer to the config file;
- *  on error, NULL is returned.
+ * Returns an open FILE pointer to the config file;
+ * on error, NULL is returned.
  */
 static FILE *open_config(char *path, const char *mode)
 {
@@ -70,18 +65,14 @@ static FILE *open_config(char *path, const char *mode)
        }
 
 error:
-       if (file_path) {
-               free(file_path);
-       }
+       free(file_path);
        return fp;
 }
 
 /*
- *  create_config_file
- *
- *  Creates the empty config file at the path.
- *  On success, returns 0;
- *  on error, returns -1.
+ * Creates the empty config file at the path.
+ * On success, returns 0;
+ * on error, returns -1.
  */
 static int create_config_file(char *path)
 {
@@ -102,11 +93,9 @@ error:
 }
 
 /*
- *  write_config
- *
- *  Append data to the config file in file_path
- *  On success, returns 0;
- *  on error, returns -1.
+ * Append data to the config file in file_path
+ * On success, returns 0;
+ * on error, returns -1.
  */
 static int write_config(char *file_path, size_t size, char *data)
 {
@@ -125,15 +114,15 @@ static int write_config(char *file_path, size_t size, char *data)
        if (len != 1) {
                ret = -1;
        }
-       fclose(fp);
+       if (fclose(fp)) {
+               PERROR("close write_config");
+       }
 end:
        return ret;
 }
 
 /*
- *  config_get_default_path
- *
- *  Returns the HOME directory path. Caller MUST NOT free(3) the return pointer.
+ * Returns the HOME directory path. Caller MUST NOT free(3) the return pointer.
  */
 char *config_get_default_path(void)
 {
@@ -141,9 +130,7 @@ char *config_get_default_path(void)
 }
 
 /*
- *  config_destroy
- *
- *  Destroys directory config and file config.
+ * Destroys directory config and file config.
  */
 void config_destroy(char *path)
 {
@@ -155,20 +142,50 @@ void config_destroy(char *path)
                return;
        }
 
+       if (!config_exists(config_path)) {
+               goto end;
+       }
+
+       DBG("Removing %s\n", config_path);
        ret = remove(config_path);
        if (ret < 0) {
                perror("remove config file");
        }
-
+end:
        free(config_path);
 }
 
 /*
- *  config_read_session_name
- *
- *  Returns the session name from the config file.
- *  The caller is responsible for freeing the returned string.
- *  On error, NULL is returned.
+ * Destroys the default config
+ */
+void config_destroy_default(void)
+{
+       char *path = config_get_default_path();
+       if (path == NULL) {
+               return;
+       }
+       config_destroy(path);
+}
+
+/*
+ * Returns 1 if config exists, 0 otherwise
+ */
+int config_exists(const char *path)
+{
+       int ret;
+       struct stat info;
+
+       ret = stat(path, &info);
+       if (ret < 0) {
+               return 0;
+       }
+       return S_ISREG(info.st_mode) || S_ISDIR(info.st_mode);
+}
+
+/*
+ * Returns the session name from the config file.
+ * The caller is responsible for freeing the returned string.
+ * On error, NULL is returned.
  */
 char *config_read_session_name(char *path)
 {
@@ -204,23 +221,27 @@ char *config_read_session_name(char *path)
        }
 
 error_close:
-       fclose(fp);
+       ret = fclose(fp);
+       if (ret < 0) {
+               PERROR("close config read session name");
+       }
 
 error:
        return NULL;
 
 found:
-       fclose(fp);
+       ret = fclose(fp);
+       if (ret < 0) {
+               PERROR("close config read session name found");
+       }
        return session_name;
 
 }
 
 /*
- *  config_add_session_name
- *
- *  Write session name option to the config file.
- *  On success, returns 0;
- *  on error, returns -1.
+ * Write session name option to the config file.
+ * On success, returns 0;
+ * on error, returns -1.
  */
 int config_add_session_name(char *path, char *name)
 {
@@ -242,11 +263,9 @@ error:
 }
 
 /*
- *  config_init
- *
- *  Init configuration directory and file.
- *  On success, returns 0;
- *  on error, returns -1.
+ * Init configuration directory and file.
+ * On success, returns 0;
+ * on error, returns -1.
  */
 int config_init(char *session_name)
 {