X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng%2Fcommands%2Fcreate.c;h=5dc51b80f14afd10835faaf61e6a39d18edd512e;hb=4b082b1252f03d83e732102b97bb6115da5728ab;hp=10e5ffdbc02cbdbfa496376440a856fe664d91c7;hpb=7b3f7be251130172712e02262d413e90f3252978;p=lttng-tools.git diff --git a/src/bin/lttng/commands/create.c b/src/bin/lttng/commands/create.c index 10e5ffdbc..5dc51b80f 100644 --- a/src/bin/lttng/commands/create.c +++ b/src/bin/lttng/commands/create.c @@ -1,19 +1,9 @@ /* - * Copyright (C) 2011 - David Goulet - * Copyright (C) 2019 - Jérémie Galarneau + * Copyright (C) 2011 EfficiOS Inc. + * Copyright (C) 2019 Jérémie Galarneau * - * 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 @@ -39,8 +29,8 @@ #include #include #include -#include -#include +#include +#include static char *opt_output_path; static char *opt_session_name; @@ -143,7 +133,6 @@ end: static struct lttng_session_descriptor *create_session_descriptor(void) { - int ret; ssize_t uri_count; enum output_type output_type; struct lttng_uri *uris = NULL; @@ -155,6 +144,7 @@ struct lttng_session_descriptor *create_session_descriptor(void) output_type = OUTPUT_NONE; } else if (opt_output_path) { char *expanded_output_path; + int ret; output_type = OUTPUT_LOCAL; expanded_output_path = utils_expand_path(opt_output_path); @@ -171,6 +161,8 @@ struct lttng_session_descriptor *create_session_descriptor(void) goto end; } } else if (opt_url || opt_ctrl_url) { + int ret; + uri_str1 = opt_ctrl_url ? opt_ctrl_url : opt_url; uri_str2 = opt_data_url; @@ -511,7 +503,7 @@ error: * * Spawn a session daemon by forking and execv. */ -static int spawn_sessiond(char *pathname) +static int spawn_sessiond(const char *pathname) { int ret = 0; pid_t pid; @@ -590,7 +582,7 @@ end: static int launch_sessiond(void) { int ret; - char *pathname = NULL; + const char *pathname = NULL; ret = lttng_session_daemon_alive(); if (ret) {