Clean-up: uri_parse_str_urls: assert on invalid uri_parse() return values

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

diff --git a/src/common/uri.c b/src/common/uri.c
index c735e856f3b12787106b86b0c4b184c5f075057c..0f89468c54f3c0f10aa1610df592a6d430a4bd27 100644 (file)
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -1,18 +1,8 @@
 /*
- * Copyright (C) 2012 - David Goulet <dgoulet@efficios.com>
+ * Copyright (C) 2012 David Goulet <dgoulet@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
@@ -136,7 +126,7 @@ static int set_ip_address(const char *addr, int af, char *dst, size_t size)
                         * We choose to use the system name resolution API first
                         * to honor its network configuration. If this fails, we
                         * resolve to the appropriate loopback address. This is
-                        * done to accomodate systems which may want to start
+                        * done to accommodates systems which may want to start
                         * tracing before their network configured.
                         */
                        const char *loopback_addr = af == AF_INET ?
@@ -587,6 +577,9 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
                        goto parse_error;
                }
 
+               /* 1 and 2 are the only expected values on success. */
+               assert(size_ctrl == 1 || size_ctrl == 2);
+
                /* At this point, we know there is at least one URI in the array */
                set_default_uri_attr(&ctrl_uris[0], LTTNG_STREAM_CONTROL);
 
@@ -624,6 +617,9 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
                } else if (size_data == 2) {
                        ERR("Data URL can not be set with the net[4|6]:// protocol");
                        goto error;
+               } else {
+                       /* 1 and 2 are the only expected values on success. */
+                       assert(size_data == 1);
                }
 
                set_default_uri_attr(&data_uris[0], LTTNG_STREAM_DATA);