bin: compile lttng as C++

[lttng-tools.git] / src / common / spawn-viewer.c

diff --git a/src/common/spawn-viewer.c b/src/common/spawn-viewer.c
index 1d668157f729e11e47f5fb199976c0b0a0b771d1..52be70526e5309e6c1ee10acefef030bf9238c39 100644 (file)
--- a/src/common/spawn-viewer.c
+++ b/src/common/spawn-viewer.c
@@ -7,7 +7,6 @@
  *
  */
 
-#include <assert.h>
 #include <stdbool.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -69,7 +68,7 @@ static char **alloc_argv_from_user_opts(char *opts, const char *trace_path)
 {
        int i = 0, ignore_space = 0;
        unsigned int num_opts = 1;
-       char **argv, *token = opts, *saveptr;
+       char **argv, *token = opts, *saveptr = NULL;
 
        /* Count number of arguments. */
        do {
@@ -249,7 +248,7 @@ retry_viewer:
         * This function should never return if successfull because `execvp(3)`
         * onle returns if an error has occurred.
         */
-       assert(ret != 0);
+       LTTNG_ASSERT(ret != 0);
 error:
        free(argv);
        return ret;