Fix: undefined operation on last_relay_viewer_session_id
authorMathieu Desnoyers <mathieu.desnoyers@efficios.com>
Tue, 2 Dec 2014 22:21:11 +0000 (17:21 -0500)
committerJérémie Galarneau <jeremie.galarneau@efficios.com>
Mon, 12 Jan 2015 16:57:58 +0000 (11:57 -0500)
Triggers compiler warning on 32-bit build.

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
src/bin/lttng-relayd/live.c

index 55f5c80355afb7535e36056352218bc66967ecaa..ed52012407be36ef76a04d1c494a028d148bf6cd 100644 (file)
@@ -712,7 +712,12 @@ int viewer_connect(struct relay_connection *conn)
        reply.major = htobe32(reply.major);
        reply.minor = htobe32(reply.minor);
        if (conn->type == RELAY_VIEWER_COMMAND) {
-               reply.viewer_session_id = htobe64(++last_relay_viewer_session_id);
+               /*
+                * Increment outside of htobe64 macro, because can be used more than once
+                * within the macro, and thus the operation may be undefined.
+                */
+               last_relay_viewer_session_id++;
+               reply.viewer_session_id = htobe64(last_relay_viewer_session_id);
        }
 
        health_code_update();
This page took 0.03453 seconds and 4 git commands to generate.