This fourth patch simplifies create_session() in create.c ------------------------------ >From e81d91e548bc9dc94dc9e89ff0bf1150f43ebbda Mon, 30 Jan 2012 16:03:10 -0500 From: Daniel U. Thibault <[email protected]> Date: Mon, 30 Jan 2012 16:02:53 -0500 Subject: [PATCH] lttng-tools : create.c : Simplify create_session()
Signed-off-by: Daniel U. Thibault <[email protected]> diff --git a/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng/commands/create.c b/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng/commands/create.c index 9dc3752..de2d909 100644 --- a/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng/commands/create.c +++ b/lttng2-lttng-tools-2.0-pre18+-5c73c59/src/bin/lttng/commands/create.c @@ -67,7 +67,7 @@ */ static int create_session() { - int ret, have_name = 0; + int ret; char datetime[16]; char *session_name, *traces_path = NULL, *alloc_path = NULL; time_t rawtime; @@ -80,37 +80,33 @@ /* Auto session name creation */ if (opt_session_name == NULL) { - ret = asprintf(&session_name, "auto-%s", datetime); + ret = asprintf(&session_name, "auto"); if (ret < 0) { perror("asprintf session name"); + ret = CMD_ERROR; goto error; } DBG("Auto session name set to %s", session_name); } else { session_name = opt_session_name; - have_name = 1; } /* Auto output path */ if (opt_output_path == NULL) { alloc_path = strdup(config_get_default_path()); if (alloc_path == NULL) { - ERR("Home path not found.\n \ - Please specify an output path using -o, --output PATH"); + ERR("Home path not found.\n%s" + "Please specify an output path using -o, --output PATH\n"); ret = CMD_FATAL; goto error; } - if (have_name) { - ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME + ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME "/%s-%s", alloc_path, session_name, datetime); - } else { - ret = asprintf(&traces_path, "%s/" DEFAULT_TRACE_DIR_NAME - "/%s", alloc_path, session_name); - } if (ret < 0) { perror("asprintf trace dir name"); + ret = CMD_ERROR; goto error; } } else { ------------------------------ Daniel U. Thibault R & D pour la défense Canada - Valcartier (RDDC Valcartier) / Defence R&D Canada - Valcartier (DRDC Valcartier) Système de systèmes (SdS) / System of Systems (SoS) Solutions informatiques et expérimentations (SIE) / Computing Solutions and Experimentations (CSE) 2459 Boul. Pie XI Nord Québec, QC G3J 1X5 CANADA Vox : (418) 844-4000 x4245 Fax : (418) 844-4538 NAC: 918V QSDJ Gouvernement du Canada / Government of Canada <http://www.valcartier.drdc-rddc.gc.ca/> _______________________________________________ lttng-dev mailing list [email protected] http://lists.lttng.org/cgi-bin/mailman/listinfo/lttng-dev
