cppcheck: don't check NULL pointer before freeing them

[lttng-tools.git] / src / common / uri.c

diff --git a/src/common/uri.c b/src/common/uri.c
index 3550af9755d22c5c0449cc2f11c8cb2657a4d6df..5cc53525f1f09a37c1dd9ae73ebae40d15316656 100644 (file)
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -189,10 +189,7 @@ int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
 __attribute__((visibility("hidden")))
 void uri_free(struct lttng_uri *uri)
 {
-       /* Safety check */
-       if (uri != NULL) {
-               free(uri);
-       }
+       free(uri);
 }
 
 /*
@@ -342,7 +339,6 @@ ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
         * so we can define the control and data port.
         */
        while (*purl == ':') {
-               int port;
                const char *port_b, *port_e;
                char *port_f;
 
@@ -369,6 +365,8 @@ ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
                port_e = purl;
 
                if (port_b != port_e) {
+                       int port;
+
                        port_f = utils_strdupdelim(port_b, port_e);
                        if (port_f == NULL) {
                                goto free_error;