X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fsnapshot-session.c;h=058179633db411d6e29c42fc52c59af24b13fc94;hp=9e8e43577492b3f4d5bd0f3610fb529d7c37299a;hb=0c51e8f329cdd907761e34c3e4394200a56c6812;hpb=757c48a28258e64fe251b6803ccdba7898590d70

diff --git a/src/common/actions/snapshot-session.c b/src/common/actions/snapshot-session.c
index 9e8e43577..058179633 100644
--- a/src/common/actions/snapshot-session.c
+++ b/src/common/actions/snapshot-session.c
@@ -124,16 +124,9 @@ end:
 	return is_equal;
 }
 
-static size_t serialize_strlen(const char *s)
+static size_t serialize_strlen(const char *str)
 {
-
-	size_t len = 0;
-
-	if (s) {
-		len = strlen(s) + 1;
-	}
-
-	return len;
+	return str ? strlen(str) + 1 : 0;
 }
 
 static int lttng_action_snapshot_session_serialize(
@@ -258,7 +251,7 @@ ssize_t lttng_action_snapshot_session_create_from_payload(
 				comm->snapshot_output_len);
 
 		if (!snapshot_output_buffer_view.buffer.data) {
-			fprintf(stderr, "Failed to create buffer view for snapshot output.\n");
+			ERR("Failed to create buffer view for snapshot output.");
 			goto error;
 		}
 
@@ -267,8 +260,7 @@ ssize_t lttng_action_snapshot_session_create_from_payload(
 						&snapshot_output_buffer_view,
 						&snapshot_output);
 		if (snapshot_output_consumed_len != comm->snapshot_output_len) {
-			fprintf(stderr,
-					"Failed to deserialize snapshot output object: "
+			ERR("Failed to deserialize snapshot output object: "
 					"consumed-len: %zd, expected-len: %" PRIu32,
 					snapshot_output_consumed_len,
 					comm->snapshot_output_len);