X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fcmd.c;h=4c5160764aac0612992610b985db805fd589e7ca;hb=36e6632013ee40eabfbe50db19ebd8e606ba0204;hp=534f191a8b447d0763d56ec62d4aba42a0c3af70;hpb=dd73d57bb95fae31161ca0781108d166082a06f5;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c index 534f191a8..4c5160764 100644 --- a/src/bin/lttng-sessiond/cmd.c +++ b/src/bin/lttng-sessiond/cmd.c @@ -3671,10 +3671,12 @@ static int clear_metadata_file(int fd) { int ret; + off_t lseek_ret; - ret = lseek(fd, 0, SEEK_SET); - if (ret < 0) { + lseek_ret = lseek(fd, 0, SEEK_SET); + if (lseek_ret < 0) { PERROR("lseek"); + ret = -1; goto end; } @@ -4646,7 +4648,7 @@ int cmd_rotate_get_info(struct ltt_session *session, current_tracing_path_reply_len = sizeof(info_return->location.local.absolute_path); info_return->location_type = - (uint8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL; + (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_LOCAL; break; case CONSUMER_DST_NET: current_tracing_path_reply = @@ -4655,7 +4657,7 @@ int cmd_rotate_get_info(struct ltt_session *session, sizeof(info_return->location.relay.relative_path); /* Currently the only supported relay protocol. */ info_return->location.relay.protocol = - (uint8_t) LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP; + (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_RELAY_PROTOCOL_TYPE_TCP; ret = lttng_strncpy(info_return->location.relay.host, session_get_net_consumer_hostname(session), @@ -4671,7 +4673,7 @@ int cmd_rotate_get_info(struct ltt_session *session, &info_return->location.relay.ports.control, &info_return->location.relay.ports.data); info_return->location_type = - (uint8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY; + (int8_t) LTTNG_TRACE_ARCHIVE_LOCATION_TYPE_RELAY; break; default: abort();