Build fix: Missing message in LTTNG_DEPRECATED invocation

[lttng-tools.git] / src / common / readwrite.c

diff --git a/src/common/readwrite.c b/src/common/readwrite.c
index 42a048fdabd2d3abaf0e32d561f9cb901930baff..14ec171f95b0cbf693a47f9674a0cbaf0d15103f 100644 (file)
--- a/src/common/readwrite.c
+++ b/src/common/readwrite.c
@@ -1,26 +1,16 @@
 /*
- * Copyright (C) 2013 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2013 Mathieu Desnoyers <mathieu.desnoyers@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, version 2.1 only,
- * as published by the Free Software Foundation.
+ * SPDX-License-Identifier: LGPL-2.1-only
  *
- * 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 _LGPL_SOURCE
-#include <assert.h>
-#include <errno.h>
 #include <limits.h>
 #include <unistd.h>
 
+#include <common/compat/errno.h>
+
 #include "readwrite.h"
 
 /*
@@ -28,16 +18,15 @@
  * Upon success, they return the "count" received as parameter.
  * They can return a negative value if an error occurs.
  * If a value lower than the requested "count" is returned, it means an
- * error occured.
+ * error occurred.
  * The error can be checked by querying errno.
  */
-LTTNG_HIDDEN
 ssize_t lttng_read(int fd, void *buf, size_t count)
 {
        size_t i = 0;
        ssize_t ret;
 
-       assert(buf);
+       LTTNG_ASSERT(buf);
 
        /*
         * Deny a read count that can be bigger then the returned value max size.
@@ -57,7 +46,7 @@ ssize_t lttng_read(int fd, void *buf, size_t count)
                        }
                }
                i += ret;
-               assert(i <= count);
+               LTTNG_ASSERT(i <= count);
        } while (count - i > 0 && ret > 0);
        return i;
 
@@ -69,13 +58,12 @@ error:
        }
 }
 
-LTTNG_HIDDEN
 ssize_t lttng_write(int fd, const void *buf, size_t count)
 {
        size_t i = 0;
        ssize_t ret;
 
-       assert(buf);
+       LTTNG_ASSERT(buf);
 
        /*
         * Deny a write count that can be bigger then the returned value max size.
@@ -95,7 +83,7 @@ ssize_t lttng_write(int fd, const void *buf, size_t count)
                        }
                }
                i += ret;
-               assert(i <= count);
+               LTTNG_ASSERT(i <= count);
        } while (count - i > 0 && ret > 0);
        return i;