Move side effects out of assert()

2 files changed, 8 insertions, 3 deletions

diff --git a/gpsd.h-tail b/gpsd.h-tail
index db25ca96..987ec768 100644
--- a/gpsd.h-tail
+++ b/gpsd.h-tail
@@ -1041,7 +1041,11 @@ void cfmakeraw(struct termios *);
 #define DEVICEHOOKPATH "/"SYSCONFDIR"/gpsd/device-hook"
 
 /* Needed because 4.x versions of GCC are really annoying */
-#define ignore_return(funcall)	assert(funcall != -23)
+#define ignore_return(funcall) \
+    do { \
+        ssize_t result = (funcall); \
+        assert(result != -23); \
+    } while (0)
 
 static /*@unused@*/ inline void memory_barrier(void)
 {
diff --git a/gpsmon.c b/gpsmon.c
index a5ee0b2a..ab6da9fb 100644
--- a/gpsmon.c
+++ b/gpsmon.c
@@ -726,9 +726,10 @@ static void gpsmon_hook(struct gps_device_t *device, gps_mask_t changed UNUSED)
 
     if (logfile != NULL && device->lexer.outbuflen > 0) {
         /*@ -shiftimplementation -sefparams +charint @*/
-        assert(fwrite
+        size_t written_count = fwrite
                (device->lexer.outbuffer, sizeof(char),
-                device->lexer.outbuflen, logfile) >= 1);
+                device->lexer.outbuflen, logfile);
+        assert(written_count >= 1);
         /*@ +shiftimplementation +sefparams -charint @*/
     }