Fix building with NDEBUG

This disables `assert()` and thus caused some warnings/errors and
missing code.

Add a test case to cover this mode.

Author: martinpitt

src/ioctl_tree.c

@@ -243,12 +243,12 @@ ioctl_tree_read(FILE * f)
 void
 ioctl_tree_write(FILE * f, const ioctl_tree * tree)
 {
-    int i;
+    int res;
     if (tree == NULL)
 	return;
 
     /* write indent */
-    for (i = 0; i < tree->depth; ++i)
+    for (int i = 0; i < tree->depth; ++i)
 	fputc(' ', f);
     if (tree->id != tree->type->id) {
 	long offset;
@@ -260,7 +260,8 @@ ioctl_tree_write(FILE * f, const ioctl_tree * tree)
 	fprintf(f, "%s %i ", tree->type->name, tree->ret);
     }
     tree->type->write(tree, f);
-    assert(fputc('\n', f) == '\n');
+    res = fputc('\n', f);
+    assert(res == '\n');
 
     ioctl_tree_write(f, tree->child);
     ioctl_tree_write(f, tree->next);

src/libumockdev-preload.c

@@ -452,6 +452,8 @@ ioctl_record_open(int fd)
 
     /* lazily open the record file */
     if (ioctl_record_log == NULL) {
+	int r;
+
 	const char *path = getenv("UMOCKDEV_IOCTL_RECORD_FILE");
 	const char *device_path = getenv("UMOCKDEV_IOCTL_RECORD_DEVICE_PATH");
 	struct sigaction act_int;
@@ -514,9 +516,11 @@ ioctl_record_open(int fd)
 
 	/* ensure that we write the file also on Control-C */
 	act_int.sa_handler = ioctl_record_sigint_handler;
-	assert(sigemptyset(&act_int.sa_mask) == 0);
+	r = sigemptyset(&act_int.sa_mask);
+	assert(r == 0);
 	act_int.sa_flags = 0;
-	assert(sigaction(SIGINT, &act_int, &orig_actint) == 0);
+	r = sigaction(SIGINT, &act_int, &orig_actint);
+	assert(r == 0);
 
 	DBG(DBG_IOCTL, "ioctl_record_open: starting ioctl recording of fd %i into %s\n", fd, path);
     } else {
@@ -535,8 +539,11 @@ ioctl_record_close(int fd)
 
     /* recorded anything? */
     if (ioctl_record != NULL) {
+	int r;
+
 	rewind(ioctl_record_log);
-	assert(ftruncate(fileno(ioctl_record_log), 0) == 0);
+	r = ftruncate(fileno(ioctl_record_log), 0);
+	assert(r == 0);
 	fprintf(ioctl_record_log, "@DEV %s\n", getenv("UMOCKDEV_IOCTL_RECORD_DEVICE_PATH"));
 	ioctl_tree_write(ioctl_record_log, ioctl_record);
 	fflush(ioctl_record_log);
@@ -545,9 +552,12 @@ ioctl_record_close(int fd)
 
 static void ioctl_record_sigint_handler(int signum)
 {
+    int r;
+
     DBG(DBG_IOCTL, "ioctl_record_sigint_handler: got signal %i, flushing record\n", signum);
     ioctl_record_close(ioctl_record_fd);
-    assert(sigaction(SIGINT, &orig_actint, NULL) == 0);
+    r = sigaction(SIGINT, &orig_actint, NULL);
+    assert(r == 0);
     raise(signum);
 }
 
@@ -851,7 +861,10 @@ script_start_record(int fd, const char *logname, const char *recording_path, enu
 
     srinfo = malloc(sizeof(struct script_record_info));
     srinfo->log = log;
-    assert(clock_gettime(CLOCK_MONOTONIC, &srinfo->time) == 0);
+    if (clock_gettime(CLOCK_MONOTONIC, &srinfo->time) < 0) {
+	fprintf(stderr, "libumockdev-preload: failed to clock_gettime: %m\n");
+	abort();
+    }
     srinfo->op = 0;
     srinfo->fmt = fmt;
     fd_map_add(&script_recorded_fds, fd, srinfo);
@@ -861,9 +874,10 @@ static void
 script_record_open(int fd)
 {
     dev_t fd_dev;
-    const char *logname, *recording_path;
-    const void* data;
+    const char *logname, *recording_path = NULL;
+    const void* data = NULL;
     enum script_record_format fmt;
+    int r;
 
     if (!script_dev_logfile_map_inited)
 	init_script_dev_logfile_map();
@@ -874,8 +888,10 @@ script_record_open(int fd)
 	DBG(DBG_SCRIPT, "script_record_open: fd %i on device %i:%i is not recorded\n", fd, major(fd_dev), minor(fd_dev));
 	return;
     }
-    assert (fd_map_get(&script_dev_devpath_map, fd_dev, (const void **)&recording_path));
-    assert (fd_map_get(&script_dev_format_map, fd_dev, &data));
+    r = fd_map_get(&script_dev_devpath_map, fd_dev, (const void **)&recording_path);
+    assert(r);
+    r = fd_map_get(&script_dev_format_map, fd_dev, &data);
+    assert(r);
     fmt = (enum script_record_format) data;
 
     DBG(DBG_SCRIPT, "script_record_open: start recording fd %i on device %i:%i into %s (format %i)\n",
@@ -924,7 +940,10 @@ update_msec(struct timespec *tm)
 {
     struct timespec now;
     long delta;
-    assert(clock_gettime(CLOCK_MONOTONIC, &now) == 0);
+    if (clock_gettime(CLOCK_MONOTONIC, &now) < 0) {
+	fprintf(stderr, "libumockdev-preload: failed to clock_gettime: %m\n");
+	abort();
+    }
     delta = (now.tv_sec - tm->tv_sec) * 1000 + now.tv_nsec / 1000000 - tm->tv_nsec / 1000000;
     assert(delta >= 0);
     *tm = now;
@@ -940,7 +959,7 @@ script_record_op(char op, int fd, const void *buf, ssize_t size)
     libc_func(fwrite, size_t, const void *, size_t, size_t, FILE *);
     static char header[100];
     const unsigned char *cur;
-    int i;
+    int i, r;
 
     if (!fd_map_get(&script_recorded_fds, fd, (const void **)&srinfo))
 	return;
@@ -959,7 +978,8 @@ script_record_op(char op, int fd, const void *buf, ssize_t size)
 		if (srinfo->op != 0)
 		    putc('\n', srinfo->log);
 		snprintf(header, sizeof(header), "%c %lu ", op, delta);
-		assert(_fwrite(header, strlen(header), 1, srinfo->log) == 1);
+		r = _fwrite(header, strlen(header), 1, srinfo->log);
+		assert(r == 1);
 	    }
 
 	    /* escape ASCII control chars */

tests/chatter-socket-stream.c

@@ -23,11 +23,21 @@
 #include <assert.h>
 #include <fcntl.h>
 #include <unistd.h>
+#include <stdlib.h>
 #include <string.h>
 #include <sys/socket.h>
 #include <sys/un.h>
 
-#define writestr(s) assert(write(fd, s, strlen(s)) >= 0)
+static void
+writestr (int fd, const char *s)
+{
+    int r;
+    r = write(fd, s, strlen(s));
+    if (r <= 0) {
+        perror ("write");
+        abort();
+    }
+}
 
 int
 main(int argc, char **argv)
@@ -56,17 +66,18 @@ main(int argc, char **argv)
         return 1;
     }
 
-    writestr("What is your name?\n");
+    writestr(fd, "What is your name?\n");
     len = read(fd, buf, sizeof(buf) - 1);
     assert(len >= 0);
     buf[len] = 0;
     printf("Got name: %s\n", buf);
-    writestr("hello ");
-    writestr(buf);
+    writestr(fd, "hello ");
+    writestr(fd, buf);
 
     /* test send/recv, too */
     usleep(20000);
-    assert(send(fd, "send()", 6, 0) == 6);
+    len = send(fd, "send()", 6, 0);
+    assert(len == 6);
 
     len = recv(fd, buf, sizeof(buf) - 1, 0);
     assert(len > 0);

tests/chatter.c

@@ -19,12 +19,22 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
 
-#define writestr(s) assert(write(fd, s, strlen(s)) >= 0)
+static void
+writestr (int fd, const char *s)
+{
+    int r;
+    r = write(fd, s, strlen(s));
+    if (r <= 0) {
+        perror ("write");
+        abort();
+    }
+}
 
 int
 main(int argc, char **argv)
@@ -43,20 +53,20 @@ main(int argc, char **argv)
 	perror("open:");
 	return 1;
     }
-    writestr("Hello world!\n");
-    writestr("What is your name?\n");
+    writestr(fd, "Hello world!\n");
+    writestr(fd, "What is your name?\n");
     len = read(fd, buf, sizeof(buf) - 1);
     assert(len >= 0);
     buf[len] = 0;
     printf("Got input: %s", buf);
-    writestr("I ♥ ");
-    writestr(buf);
-    writestr("a\t tab and a\n   line break in one write\n");
+    writestr(fd, "I ♥ ");
+    writestr(fd, buf);
+    writestr(fd, "a\t tab and a\n   line break in one write\n");
     len = read(fd, buf, sizeof(buf) - 1);
     assert(len >= 0);
     buf[len] = 0;
     printf("Got input: %s", buf);
-    writestr("bye!\n");
+    writestr(fd, "bye!\n");
     close(fd);
     return 0;
 }

tests/run-ubuntu-chroot

@@ -59,9 +59,9 @@ trap "pkill -e -kill Xorg || true" EXIT INT QUIT PIPE
 set -ex
 cd /build/src
 ./autogen.sh --prefix=/usr
-make -j4
+make -j$(nproc)
 make check-valgrind
-make -j4 distcheck
+make -j$(nproc) distcheck
 EOU
 
 # install and run check-installed
@@ -74,5 +74,14 @@ set -ex
 cd /build/src
 make check-installed
 EOU
+
+# check build without assertions
+su - buildd <<EOU
+set -ex
+cd /build/src
+make distclean
+./autogen.sh --prefix=/usr CPPFLAGS=-DNDEBUG
+make -j$(nproc) check
+EOU
 EOF
 cp "$CHROOT"/build/src/umockdev-*.tar.xz .