Fix: Reverse incorrect error message argument order

[babeltrace.git] / formats / lttng-live / lttng-live-plugin.c

diff --git a/formats/lttng-live/lttng-live-plugin.c b/formats/lttng-live/lttng-live-plugin.c
index b3c660c8d7648fec124f90bc257a30524d1b00f3..83c0458289bc1e9e2b0d9ac024eeaf0c679f3dbc 100644 (file)
--- a/formats/lttng-live/lttng-live-plugin.c
+++ b/formats/lttng-live/lttng-live-plugin.c
@@ -46,14 +46,14 @@ int parse_url(const char *path, struct lttng_live_ctx *ctx)
 {
        char remain[3][NAME_MAX];
        int ret = -1, proto, proto_offset = 0;
-       size_t path_len = strlen(path);
+       size_t path_len = strlen(path); /* not accounting \0 */
 
        /*
         * Since sscanf API does not allow easily checking string length
         * against a size defined by a macro. Test it beforehand on the
         * input. We know the output is always <= than the input length.
         */
-       if (path_len > NAME_MAX) {
+       if (path_len >= NAME_MAX) {
                goto end;
        }
        ret = sscanf(path, "net%d://", &proto);
@@ -102,8 +102,9 @@ int parse_url(const char *path, struct lttng_live_ctx *ctx)
                }
        }
 
-       if (ctx->port < 0)
+       if (ctx->port < 0) {
                ctx->port = LTTNG_DEFAULT_NETWORK_VIEWER_PORT;
+       }
 
        if (strlen(remain[2]) == 0) {
                printf_verbose("Connecting to hostname : %s, port : %d, "
@@ -172,8 +173,9 @@ static int lttng_live_open_trace_read(const char *path)
                goto end_free;
        }
 
-       if (ctx->session_ids->len > 0)
+       if (ctx->session_ids->len > 0) {
                lttng_live_read(ctx);
+       }
 
 end_free:
        g_hash_table_destroy(ctx->session->ctf_traces);