src: Finish assert() clean-up

From cleanup commit 0cecde304:
assert()s can be compiled away by #defining NDEBUG. Some build systems
do this. Using wl_abort gives a human readable error message and it
isn't compiled away.

That commit missed one final assert, presumably due to missing it with
grep because of a coding style issue. Fix that up, and remove inclusion
of <assert.h> as appropriate.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2024-07-16 06:31:13 -05:00 committed by Simon Ser
parent 2bbd80c8df
commit 58bb6c7211
6 changed files with 2 additions and 7 deletions

View file

@ -29,7 +29,6 @@
* http://fontforge.org/pcf-format.html * http://fontforge.org/pcf-format.html
*/ */
#include <assert.h>
#include <fcntl.h> #include <fcntl.h>
#include <stdint.h> #include <stdint.h>
#include <stdio.h> #include <stdio.h>

View file

@ -26,7 +26,6 @@
#define _GNU_SOURCE #define _GNU_SOURCE
#include <assert.h>
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <stdint.h> #include <stdint.h>

View file

@ -23,7 +23,6 @@
* SOFTWARE. * SOFTWARE.
*/ */
#include <assert.h>
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include <errno.h> #include <errno.h>

View file

@ -37,7 +37,6 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <ctype.h> #include <ctype.h>
#include <assert.h>
#include <fcntl.h> #include <fcntl.h>
#include <poll.h> #include <poll.h>
#include <pthread.h> #include <pthread.h>

View file

@ -37,7 +37,6 @@
#include <sys/socket.h> #include <sys/socket.h>
#include <sys/un.h> #include <sys/un.h>
#include <dlfcn.h> #include <dlfcn.h>
#include <assert.h>
#include <sys/time.h> #include <sys/time.h>
#include <fcntl.h> #include <fcntl.h>
#include <sys/eventfd.h> #include <sys/eventfd.h>
@ -1534,7 +1533,8 @@ wl_display_terminate(struct wl_display *display)
display->run = false; display->run = false;
ret = write(display->terminate_efd, &terminate, sizeof(terminate)); ret = write(display->terminate_efd, &terminate, sizeof(terminate));
assert (ret >= 0 || errno == EAGAIN); if (ret < 0 && errno != EAGAIN)
wl_abort("Write failed at shutdown\n");
} }
WL_EXPORT void WL_EXPORT void

View file

@ -40,7 +40,6 @@
#include <sys/mman.h> #include <sys/mman.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <unistd.h> #include <unistd.h>
#include <assert.h>
#include <signal.h> #include <signal.h>
#include <pthread.h> #include <pthread.h>
#include <errno.h> #include <errno.h>