X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Ftrace-chunk.c;h=32792926928d6abb6ebed749460e3a970307c2f3;hp=ea952220b880ad4a12e106a13c90973cfdda1d19;hb=d7a20fcf33143103aa58cf1b48f4507af2d09e70;hpb=a3a75bf4721736ec16c30ee70de95e773fedf53b diff --git a/src/common/trace-chunk.c b/src/common/trace-chunk.c index ea952220b..327929269 100644 --- a/src/common/trace-chunk.c +++ b/src/common/trace-chunk.c @@ -905,7 +905,6 @@ enum lttng_trace_chunk_status lttng_trace_chunk_rename_path_no_lock( if (status != LTTNG_TRACE_CHUNK_STATUS_OK) { ERR("Error removing subdirectory '%s' file when deleting chunk", old_path); - ret = -1; goto end; } } else { @@ -1031,7 +1030,7 @@ enum lttng_trace_chunk_status lttng_trace_chunk_set_as_owner( status = LTTNG_TRACE_CHUNK_STATUS_ERROR; goto end; } - if (chunk->path[0] != '\0') { + if (chunk->path && chunk->path[0] != '\0') { ret = lttng_directory_handle_create_subdirectory_as_user( session_output_directory, chunk->path, @@ -1495,7 +1494,7 @@ end: return status; } -LTTNG_HIDDEN +static int lttng_trace_chunk_remove_subdirectory_recursive(struct lttng_trace_chunk *chunk, const char *path) {