} viewers[] = {
{ "babeltrace", VIEWER_BABELTRACE },
{ "babeltrace2", VIEWER_BABELTRACE2 },
- { NULL, VIEWER_USER_DEFINED },
+ { nullptr, VIEWER_USER_DEFINED },
};
} /* namespace */
static const struct viewer *parse_viewer_option(const char *opt_viewer)
{
- if (opt_viewer == NULL) {
+ if (opt_viewer == nullptr) {
/* Default is babeltrace2 */
return &(viewers[VIEWER_BABELTRACE2]);
}
{
int i = 0, ignore_space = 0;
unsigned int num_opts = 1;
- char **argv, *token = opts, *saveptr = NULL;
+ char **argv, *token = opts, *saveptr = nullptr;
/* Count number of arguments. */
do {
/* Add two here for the NULL terminating element and trace path */
argv = calloc<char *>(num_opts + 2);
- if (argv == NULL) {
+ if (argv == nullptr) {
goto error;
}
token = strtok_r(opts, " ", &saveptr);
- while (token != NULL) {
+ while (token != nullptr) {
argv[i] = strdup(token);
- if (argv[i] == NULL) {
+ if (argv[i] == nullptr) {
goto error;
}
- token = strtok_r(NULL, " ", &saveptr);
+ token = strtok_r(nullptr, " ", &saveptr);
i++;
}
argv[num_opts] = (char *) trace_path;
- argv[num_opts + 1] = NULL;
+ argv[num_opts + 1] = nullptr;
return argv;
free(argv);
}
- return NULL;
+ return nullptr;
}
/*
}
argv = calloc<char *>(mem_len);
- if (argv == NULL) {
+ if (argv == nullptr) {
goto error;
}
argv[opts_len] = (char *) "-i";
argv[opts_len + 1] = (char *) "lttng-live";
argv[opts_len + 2] = (char *) trace_path;
- argv[opts_len + 3] = NULL;
+ argv[opts_len + 3] = nullptr;
} else {
argv[opts_len] = (char *) trace_path;
- argv[opts_len + 1] = NULL;
+ argv[opts_len + 1] = nullptr;
}
error:
{
int ret = 0;
struct stat status;
- const char *viewer_bin = NULL;
+ const char *viewer_bin = nullptr;
const struct viewer *viewer;
- char **argv = NULL;
+ char **argv = nullptr;
/* Check for --viewer option. */
viewer = parse_viewer_option(opt_viewer);
- if (viewer == NULL) {
+ if (viewer == nullptr) {
ret = -1;
goto error;
}
abort();
}
- if (argv == NULL || !viewer_bin) {
+ if (argv == nullptr || !viewer_bin) {
ret = -1;
goto error;
}
viewers[VIEWER_BABELTRACE].exec_name);
viewer = &viewers[VIEWER_BABELTRACE];
free(argv);
- argv = NULL;
+ argv = nullptr;
goto retry_viewer;
} else {
ERR("Default viewer \"%s\" (and fallback \"%s\") not found on the system",