Fix: add asserts and remove unused variable

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

diff --git a/src/common/readwrite.c b/src/common/readwrite.c
index 43d4e39eeeaed22896337995b440ba2e5fe46952..0098f759b2d57dc156088126d457a86226517e65 100644 (file)
--- a/src/common/readwrite.c
+++ b/src/common/readwrite.c
@@ -15,7 +15,10 @@
  * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+#include <assert.h>
+#include <errno.h>
 #include <unistd.h>
+
 #include "readwrite.h"
 
 /*
@@ -31,8 +34,11 @@ ssize_t lttng_read(int fd, void *buf, size_t count)
        size_t i = 0;
        ssize_t ret;
 
+       assert(fd >= 0);
+       assert(buf);
+
        do {
-               ret = read(fd, &buf[i], count - i);
+               ret = read(fd, buf + i, count - i);
                if (ret < 0) {
                        if (errno == EINTR) {
                                continue;       /* retry operation */
@@ -58,8 +64,11 @@ ssize_t lttng_write(int fd, const void *buf, size_t count)
        size_t i = 0;
        ssize_t ret;
 
+       assert(fd >= 0);
+       assert(buf);
+
        do {
-               ret = write(fd, &buf[i], count - i);
+               ret = write(fd, buf + i, count - i);
                if (ret < 0) {
                        if (errno == EINTR) {
                                continue;       /* retry operation */