Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / src / bin / lttng / commands / save.c

diff --git a/src/bin/lttng/commands/save.c b/src/bin/lttng/commands/save.c
index 4ba90243698c9c13e50b3efc93dc1b57ab98c48d..4231922ad3f724f5ac36995184efd5c6053e7cdb 100644 (file)
--- a/src/bin/lttng/commands/save.c
+++ b/src/bin/lttng/commands/save.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2013 - Jérémie Galarneau <jeremie.galarneau@efficios.com>
+ * Copyright (C) 2013 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License, version 2 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: GPL-2.0-only
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _LGPL_SOURCE
@@ -21,12 +11,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <assert.h>
 
 #include <common/mi-lttng.h>
 
 #include "../command.h"
-#include <lttng/save.h>
+#include <lttng/lttng.h>
 
 static char *opt_output_path;
 static bool opt_force;
@@ -59,8 +48,8 @@ static struct poptOption save_opts[] = {
 static int mi_partial_session(const char *session_name)
 {
        int ret;
-       assert(writer);
-       assert(session_name);
+       LTTNG_ASSERT(writer);
+       LTTNG_ASSERT(session_name);
 
        /* Open session element */
        ret = mi_lttng_writer_open_element(writer, config_element_session);
@@ -86,7 +75,7 @@ end:
 static int mi_save_print(const char *session_name)
 {
        int ret;
-       assert(writer);
+       LTTNG_ASSERT(writer);
 
        if (opt_save_all) {
                /* We use a wildcard to represent all sessions */
@@ -127,7 +116,7 @@ int cmd_save(int argc, const char **argv)
 {
        int ret = CMD_SUCCESS, command_ret = CMD_SUCCESS, success;
        int opt;
-       const char *session_name = NULL;
+       const char *session_name = NULL, *leftover = NULL;
        poptContext pc;
        struct lttng_save_session_attr *attr;
 
@@ -164,6 +153,13 @@ int cmd_save(int argc, const char **argv)
                }
        }
 
+       leftover = poptGetArg(pc);
+       if (leftover) {
+               ERR("Unknown argument: %s", leftover);
+               ret = CMD_ERROR;
+               goto end;
+       }
+
        attr = lttng_save_session_attr_create();
        if (!attr) {
                ret = CMD_FATAL;