projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup configure.ac
[lttng-tools.git]
/
liblttngctl
/
lttngctl.c
diff --git
a/liblttngctl/lttngctl.c
b/liblttngctl/lttngctl.c
index fc6ff3cc1ac92b41e28184dd04dc03944ba054ce..9c3735f38f9a2896b2f4e0d611adef2a682e76ca 100644
(file)
--- a/
liblttngctl/lttngctl.c
+++ b/
liblttngctl/lttngctl.c
@@
-429,7
+429,7
@@
int lttng_start_tracing(struct lttng_handle *handle)
{
struct lttcomm_session_msg lsm;
{
struct lttcomm_session_msg lsm;
- if (
!handle
) {
+ if (
handle == NULL
) {
return -1;
}
return -1;
}
@@
-463,7
+463,8
@@
int lttng_add_context(struct lttng_handle *handle,
{
struct lttcomm_session_msg lsm;
{
struct lttcomm_session_msg lsm;
- if (!handle) {
+ /* Safety check. Both are mandatory */
+ if (handle == NULL || ctx == NULL) {
return -1;
}
return -1;
}
@@
-478,9
+479,7
@@
int lttng_add_context(struct lttng_handle *handle,
copy_lttng_domain(&lsm.domain, &handle->domain);
copy_lttng_domain(&lsm.domain, &handle->domain);
- if (ctx) {
- memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_event_context));
- }
+ memcpy(&lsm.u.context.ctx, ctx, sizeof(struct lttng_event_context));
copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
copy_string(lsm.session.name, handle->session_name,
sizeof(lsm.session.name));
@@
-496,10
+495,11
@@
int lttng_enable_event(struct lttng_handle *handle,
{
struct lttcomm_session_msg lsm;
{
struct lttcomm_session_msg lsm;
- if (
!handle
|| ev == NULL) {
+ if (
handle == NULL
|| ev == NULL) {
return -1;
}
return -1;
}
+ /* If no channel name, we put the default name */
if (channel_name == NULL) {
copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME,
sizeof(lsm.u.enable.channel_name));
if (channel_name == NULL) {
copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME,
sizeof(lsm.u.enable.channel_name));
@@
-531,7
+531,7
@@
int lttng_disable_event(struct lttng_handle *handle, const char *name,
{
struct lttcomm_session_msg lsm;
{
struct lttcomm_session_msg lsm;
- if (
!handle
) {
+ if (
handle == NULL
) {
return -1;
}
return -1;
}
@@
-566,13
+566,14
@@
int lttng_enable_channel(struct lttng_handle *handle,
{
struct lttcomm_session_msg lsm;
{
struct lttcomm_session_msg lsm;
- if (!handle) {
+ /*
+ * NULL arguments are forbidden. No default values.
+ */
+ if (handle == NULL || chan == NULL) {
return -1;
}
return -1;
}
- if (chan) {
- memcpy(&lsm.u.channel.chan, chan, sizeof(lsm.u.channel.chan));
- }
+ memcpy(&lsm.u.channel.chan, chan, sizeof(lsm.u.channel.chan));
lsm.cmd_type = LTTNG_ENABLE_CHANNEL;
lsm.cmd_type = LTTNG_ENABLE_CHANNEL;
@@
-591,17
+592,16
@@
int lttng_disable_channel(struct lttng_handle *handle, const char *name)
{
struct lttcomm_session_msg lsm;
{
struct lttcomm_session_msg lsm;
- if (!handle) {
+ /* Safety check. Both are mandatory */
+ if (handle == NULL || name == NULL) {
return -1;
}
return -1;
}
- if (name) {
- copy_string(lsm.u.disable.channel_name, name,
- sizeof(lsm.u.disable.channel_name));
- }
-
lsm.cmd_type = LTTNG_DISABLE_CHANNEL;
lsm.cmd_type = LTTNG_DISABLE_CHANNEL;
+ copy_string(lsm.u.disable.channel_name, name,
+ sizeof(lsm.u.disable.channel_name));
+
copy_lttng_domain(&lsm.domain, &handle->domain);
copy_string(lsm.session.name, handle->session_name,
copy_lttng_domain(&lsm.domain, &handle->domain);
copy_string(lsm.session.name, handle->session_name,
@@
-622,7
+622,7
@@
int lttng_list_tracepoints(struct lttng_handle *handle,
int ret;
struct lttcomm_session_msg lsm;
int ret;
struct lttcomm_session_msg lsm;
- if (
!handle
) {
+ if (
handle == NULL
) {
return -1;
}
return -1;
}
@@
-670,7
+670,7
@@
int lttng_destroy_session(struct lttng_handle *handle)
{
struct lttcomm_session_msg lsm;
{
struct lttcomm_session_msg lsm;
- if (
!handle
) {
+ if (
handle == NULL
) {
return -1;
}
return -1;
}
@@
-710,7
+710,7
@@
int lttng_list_domains(struct lttng_handle *handle,
int ret;
struct lttcomm_session_msg lsm;
int ret;
struct lttcomm_session_msg lsm;
- if (
!handle
) {
+ if (
handle == NULL
) {
return -1;
}
return -1;
}
@@
-736,7
+736,7
@@
int lttng_list_channels(struct lttng_handle *handle,
int ret;
struct lttcomm_session_msg lsm;
int ret;
struct lttcomm_session_msg lsm;
- if (
!handle
) {
+ if (
handle == NULL
) {
return -1;
}
return -1;
}
@@
-763,7
+763,8
@@
int lttng_list_events(struct lttng_handle *handle,
int ret;
struct lttcomm_session_msg lsm;
int ret;
struct lttcomm_session_msg lsm;
- if (!handle) {
+ /* Safety check. An handle and channel name are mandatory */
+ if (handle == NULL || channel_name == NULL) {
return -1;
}
return -1;
}
@@
-789,6
+790,10
@@
int lttng_list_events(struct lttng_handle *handle,
*/
int lttng_set_tracing_group(const char *name)
{
*/
int lttng_set_tracing_group(const char *name)
{
+ if (name == NULL) {
+ return -1;
+ }
+
if (asprintf(&tracing_group, "%s", name) < 0) {
return -ENOMEM;
}
if (asprintf(&tracing_group, "%s", name) < 0) {
return -ENOMEM;
}
@@
-804,7
+809,8
@@
int lttng_calibrate(struct lttng_handle *handle,
{
struct lttcomm_session_msg lsm;
{
struct lttcomm_session_msg lsm;
- if (!handle) {
+ /* Safety check. NULL pointer are forbidden */
+ if (handle == NULL || calibrate == NULL) {
return -1;
}
return -1;
}
This page took
0.025325 seconds
and
4
git commands to generate.