X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt-ring-buffer-client.h;h=1c9308e04f7151e9d38db7aeb83609bdca8c51c3;hb=6c29ebe78ae39a3eaf707aec5ad0988df0e13ca4;hp=733a800cca89d94d9fd49e62cdf46c584c27b5da;hpb=8070f5c01e8e64ce52912dd4f27021c5d9e3dce2;p=lttng-modules.git

diff --git a/ltt-ring-buffer-client.h b/ltt-ring-buffer-client.h
index 733a800c..1c9308e0 100644
--- a/ltt-ring-buffer-client.h
+++ b/ltt-ring-buffer-client.h
@@ -134,7 +134,6 @@ unsigned char record_header_size(const struct lib_ring_buffer_config *config,
 			offset += sizeof(uint32_t);	/* id */
 			offset += lib_ring_buffer_align(offset, ltt_alignof(uint64_t));
 			offset += sizeof(uint64_t);	/* timestamp */
-			
 		}
 		break;
 	default:
@@ -187,8 +186,9 @@ void ltt_write_event_header(const struct lib_ring_buffer_config *config,
 	case 2:	/* large */
 	{
 		uint32_t timestamp = (uint32_t) ctx->tsc;
+		uint16_t id = event_id;
 
-		lib_ring_buffer_write(config, ctx, &event_id, sizeof(event_id));
+		lib_ring_buffer_write(config, ctx, &id, sizeof(id));
 		lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint32_t));
 		lib_ring_buffer_write(config, ctx, &timestamp, sizeof(timestamp));
 		break;
@@ -238,8 +238,9 @@ void ltt_write_event_header_slow(const struct lib_ring_buffer_config *config,
 	{
 		if (!(ctx->rflags & (RING_BUFFER_RFLAG_FULL_TSC | LTT_RFLAG_EXTENDED))) {
 			uint32_t timestamp = (uint32_t) ctx->tsc;
+			uint16_t id = event_id;
 
-			lib_ring_buffer_write(config, ctx, &event_id, sizeof(event_id));
+			lib_ring_buffer_write(config, ctx, &id, sizeof(id));
 			lib_ring_buffer_align_ctx(ctx, ltt_alignof(uint32_t));
 			lib_ring_buffer_write(config, ctx, &timestamp, sizeof(timestamp));
 		} else {
@@ -402,7 +403,6 @@ static
 void ltt_buffer_read_close(struct lib_ring_buffer *buf)
 {
 	lib_ring_buffer_release_read(buf);
-	
 }
 
 static