uri: put `inline` at beginning of strpbrk_or_eos declaration

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

diff --git a/src/common/uri.c b/src/common/uri.c
index 380e75dd33b4839b144181c35f341a2724ef0f4e..a2a5038deb54d39df0aabe297af11b0644fa6005 100644 (file)
--- a/src/common/uri.c
+++ b/src/common/uri.c
@@ -61,7 +61,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).
  */
-static const inline char *strpbrk_or_eos(const char *s, const char *accept)
+static inline const char *strpbrk_or_eos(const char *s, const char *accept)
 {
        char *p = strpbrk(s, accept);
        if (p == NULL) {
@@ -608,7 +608,7 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
 
                if (ctrl_uris[0].dtype == LTTNG_DST_PATH &&
                                (data_url && *data_url != '\0')) {
-                       ERR("Can not have a data URL when destination is file://");
+                       ERR("Cannot have a data URL when destination is file://");
                        goto error;
                }
 
@@ -644,10 +644,12 @@ ssize_t uri_parse_str_urls(const char *ctrl_url, const char *data_url,
 
                set_default_uri_attr(&data_uris[0], LTTNG_STREAM_DATA);
 
-               ret = compare_destination(&ctrl_uris[0], &data_uris[0]);
-               if (ret != 0) {
-                       ERR("Control and data destination mismatch");
-                       goto error;
+               if (ctrl_uris) {
+                       ret = compare_destination(&ctrl_uris[0], &data_uris[0]);
+                       if (ret != 0) {
+                               ERR("Control and data destination mismatch");
+                               goto error;
+                       }
                }
        }