summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
e2c2bec)
gcc 5.4.0 complains that:
main.cpp: In function 'ssize_t relay_unpack_rotate_streams_header(const lttng_buffer_view*, lttcomm_relayd_rotate_streams*)':
main.cpp:2547:2: warning: missing initializer for member 'lttcomm_relayd_rotate_streams::rotation_positions' [-Wmissing-field-initializers]
The structure's members are initialized one by one.
At the same time, the use of the address of a packed
member (stream_count) is eliminated, which fixes another unrelated
warning emited by clang.
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I5fd90d75cc6e0ba17350fc8092929f476e93757e
* We start by "unpacking" `stream_count` to figure out the padding length
* emited by our peer.
*/
* We start by "unpacking" `stream_count` to figure out the padding length
* emited by our peer.
*/
- memcpy(&rotate_streams.stream_count, payload->data,
- sizeof(rotate_streams.stream_count));
- rotate_streams = (typeof(rotate_streams)) {
- .stream_count = be32toh(rotate_streams.stream_count),
- .new_chunk_id = LTTNG_OPTIONAL_INIT_UNSET,
- };
+ {
+ decltype(rotate_streams.stream_count) stream_count;
+
+ memcpy(&stream_count, payload->data, sizeof(stream_count));
+ rotate_streams.stream_count = be32toh(stream_count);
+ }
+
+ rotate_streams.new_chunk_id = LTTNG_OPTIONAL_INIT_UNSET;
/*
* Payload size expected given the possible padding lengths in
/*
* Payload size expected given the possible padding lengths in
memcpy(&packed_rotate_streams, payload->data, header_len);
/* Unpack the packed structure to the natively-packed version. */
memcpy(&packed_rotate_streams, payload->data, header_len);
/* Unpack the packed structure to the natively-packed version. */
- *_rotate_streams = (typeof(*_rotate_streams)) {
- .stream_count = be32toh(packed_rotate_streams.stream_count),
- .new_chunk_id = (typeof(_rotate_streams->new_chunk_id)) {
- .is_set = !!packed_rotate_streams.new_chunk_id.is_set,
- .value = be64toh(packed_rotate_streams.new_chunk_id.value),
- }
+ _rotate_streams->new_chunk_id = (typeof(_rotate_streams->new_chunk_id)){
+ .is_set = !!packed_rotate_streams.new_chunk_id.is_set,
+ .value = be64toh(packed_rotate_streams.new_chunk_id.value),
+ _rotate_streams->stream_count = be32toh(packed_rotate_streams.stream_count);
} else if (payload->size == expected_payload_size_3_bytes_padding) {
struct lttcomm_relayd_rotate_streams_3_bytes_padding padded_rotate_streams;
} else if (payload->size == expected_payload_size_3_bytes_padding) {
struct lttcomm_relayd_rotate_streams_3_bytes_padding padded_rotate_streams;
memcpy(&padded_rotate_streams, payload->data, header_len);
/* Unpack the 3-byte padded structure to the natively-packed version. */
memcpy(&padded_rotate_streams, payload->data, header_len);
/* Unpack the 3-byte padded structure to the natively-packed version. */
- *_rotate_streams = (typeof(*_rotate_streams)) {
- .stream_count = be32toh(padded_rotate_streams.stream_count),
- .new_chunk_id = (typeof(_rotate_streams->new_chunk_id)) {
- .is_set = !!padded_rotate_streams.new_chunk_id.is_set,
- .value = be64toh(padded_rotate_streams.new_chunk_id.value),
- }
+ _rotate_streams->new_chunk_id = (typeof(_rotate_streams->new_chunk_id)){
+ .is_set = !!padded_rotate_streams.new_chunk_id.is_set,
+ .value = be64toh(padded_rotate_streams.new_chunk_id.value),
+ _rotate_streams->stream_count = be32toh(padded_rotate_streams.stream_count);
} else if (payload->size == expected_payload_size_7_bytes_padding) {
struct lttcomm_relayd_rotate_streams_7_bytes_padding padded_rotate_streams;
} else if (payload->size == expected_payload_size_7_bytes_padding) {
struct lttcomm_relayd_rotate_streams_7_bytes_padding padded_rotate_streams;
memcpy(&padded_rotate_streams, payload->data, header_len);
/* Unpack the 7-byte padded structure to the natively-packed version. */
memcpy(&padded_rotate_streams, payload->data, header_len);
/* Unpack the 7-byte padded structure to the natively-packed version. */
- *_rotate_streams = (typeof(*_rotate_streams)) {
- .stream_count = be32toh(padded_rotate_streams.stream_count),
- .new_chunk_id = (typeof(_rotate_streams->new_chunk_id)) {
- .is_set = !!padded_rotate_streams.new_chunk_id.is_set,
- .value = be64toh(padded_rotate_streams.new_chunk_id.value),
- }
+ _rotate_streams->new_chunk_id = (typeof(_rotate_streams->new_chunk_id)){
+ .is_set = !!padded_rotate_streams.new_chunk_id.is_set,
+ .value = be64toh(padded_rotate_streams.new_chunk_id.value),
+ _rotate_streams->stream_count = be32toh(padded_rotate_streams.stream_count);
header_len = sizeof(padded_rotate_streams);
} else {
header_len = sizeof(padded_rotate_streams);
} else {
struct lttng_ht *token_to_event_notifier_rule_ht;
};
struct lttng_ht *token_to_event_notifier_rule_ht;
};
+/*
+ * Due to a bug in g++ < 7.1, this specialization must be enclosed in the fmt namespace,
+ * see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480.
+ */
namespace fmt {
template <>
struct formatter<ust_app> : formatter<std::string> {
namespace fmt {
template <>
struct formatter<ust_app> : formatter<std::string> {
} /* namespace sessiond */
} /* namespace lttng */
} /* namespace sessiond */
} /* namespace lttng */
+/*
+ * Due to a bug in g++ < 7.1, this specialization must be enclosed in the fmt namespace,
+ * see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480.
+ */
namespace fmt {
template <>
struct formatter<lttng::sessiond::ust::registry_event> : formatter<std::string> {
namespace fmt {
template <>
struct formatter<lttng::sessiond::ust::registry_event> : formatter<std::string> {
#include <vendor/fmt/core.h>
DIAGNOSTIC_POP
#include <vendor/fmt/core.h>
DIAGNOSTIC_POP
+/*
+ * Due to a bug in g++ < 7.1, this specialization must be enclosed in the fmt namespace,
+ * see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=56480.
+ */
namespace fmt {
template <>
struct formatter<std::type_info> : formatter<std::string> {
namespace fmt {
template <>
struct formatter<std::type_info> : formatter<std::string> {