X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Furi.c;h=740a6d5c50fc6d7fad8e027bb024d9ff9527f8c5;hp=ec5d426630b9300e925df81fa8d794b2ed282c94;hb=3cc048812bf25b42003b40b6b868b9366faefafb;hpb=ad20f4747b375cf21623ece9f76c9a9b54c493bb

diff --git a/src/common/uri.c b/src/common/uri.c
index ec5d42663..740a6d5c5 100644
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -56,7 +56,7 @@ static const struct uri_proto proto_uri[] = {
  * Return pointer to the character in s matching one of the characters in
  * accept. If nothing is found, return pointer to the end of string (eos).
  */
-const inline char *strpbrk_or_eos(const char *s, const char *accept)
+static const inline char *strpbrk_or_eos(const char *s, const char *accept)
 {
 	char *p = strpbrk(s, accept);
 	if (p == NULL) {
@@ -140,6 +140,7 @@ error:
 /*
  * Build a string URL from a lttng_uri object.
  */
+LTTNG_HIDDEN
 int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size)
 {
 	int ipver, ret;
@@ -176,6 +177,7 @@ int uri_to_str_url(struct lttng_uri *uri, char *dst, size_t size)
  *
  * Return 0 if equal else 1.
  */
+LTTNG_HIDDEN
 int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
 {
 	return memcmp(uri1, uri2, sizeof(struct lttng_uri));
@@ -184,17 +186,16 @@ int uri_compare(struct lttng_uri *uri1, struct lttng_uri *uri2)
 /*
  * Free URI memory.
  */
+LTTNG_HIDDEN
 void uri_free(struct lttng_uri *uri)
 {
-	/* Safety check */
-	if (uri != NULL) {
-		free(uri);
-	}
+	free(uri);
 }
 
 /*
  * Return an allocated URI.
  */
+LTTNG_HIDDEN
 struct lttng_uri *uri_create(void)
 {
 	struct lttng_uri *uri;
@@ -223,6 +224,7 @@ struct lttng_uri *uri_create(void)
  * This code was originally licensed GPLv2 so we acknolwedge the Free Software
  * Foundation here for the work and to make sure we are compliant with it.
  */
+LTTNG_HIDDEN
 ssize_t uri_parse(const char *str_uri, struct lttng_uri **uris)
 {
 	int ret, i = 0;
@@ -337,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;
 
@@ -364,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;