X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=libmsgpack%2Fmsgpack.c;h=10b06adc5b006335798a9ce28e2bd83679235054;hb=6ba6fd60507f8e045bdc4f1be14e9d99c6a15f7f;hp=0803bc657646b49f4dcbc7c3ffad244a0ec33a44;hpb=49705576d8779e3fa2b3efc4294bc03261f76935;p=lttng-ust.git

diff --git a/libmsgpack/msgpack.c b/libmsgpack/msgpack.c
index 0803bc65..10b06adc 100644
--- a/libmsgpack/msgpack.c
+++ b/libmsgpack/msgpack.c
@@ -1,24 +1,9 @@
 /*
- * msgpack.c
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
  * Copyright (C) 2020 Francis Deslauriers <francis.deslauriers@efficios.com>
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; only
- * version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
-#define _GNU_SOURCE
 #define _LGPL_SOURCE
 #include <stddef.h>
 
@@ -76,7 +61,7 @@
 
 #else /* __KERNEL__ */
 
-#include <endian.h>
+#include <lttng/ust-endian.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -316,7 +301,7 @@ int lttng_msgpack_begin_map(struct lttng_msgpack_writer *writer, size_t count)
 {
 	int ret;
 
-	if (count < 0 || count >= (1 << 16)) {
+	if (count >= (1 << 16)) {
 		ret = -1;
 		goto end;
 	}
@@ -343,7 +328,7 @@ int lttng_msgpack_begin_array(
 {
 	int ret;
 
-	if (count < 0 || count >= (1 << 16)) {
+	if (count >= (1 << 16)) {
 		ret = -1;
 		goto end;
 	}
@@ -370,7 +355,8 @@ int lttng_msgpack_write_str(struct lttng_msgpack_writer *writer,
 {
 	int ret;
 	size_t length = strlen(str);
-	if (length < 0 || length >= (1 << 16)) {
+
+	if (length >= (1 << 16)) {
 		ret = -1;
 		goto end;
 	}
@@ -501,7 +487,6 @@ void lttng_msgpack_writer_init(struct lttng_msgpack_writer *writer,
 		uint8_t *buffer, size_t size)
 {
 	lttng_msgpack_assert(buffer);
-	lttng_msgpack_assert(size >= 0);
 
 	writer->buffer = buffer;
 	writer->write_pos = buffer;