fix other pthread_t arithmetic comparison

should use `pthread_equal(thread_id, PTHREAD_NULL)`, see the commit HEAD~3

Author: MartinPulec

src/audio/export.c

@@ -42,9 +42,11 @@
 #include <unistd.h>
 #include <string.h>             // for memcpy, strdup
 
+#define WANT_PTHREAD_NULL
 #include "audio/types.h"        // for audio_desc, audio_frame, AC_PCM
 #include "audio/utils.h"
 #include "audio/wav_writer.h"
+#include "compat/misc.h"        // for PTHREAD_NULL
 #include "export.h"
 #include "utils/misc.h" // ug_strerror
 #include "utils/ring_buffer.h"
@@ -160,7 +162,7 @@ struct audio_export * audio_export_init(const char *filename)
 
         unlink(filename);
         s->filename = strdup(filename);
-        s->thread_id = 0;
+        s->thread_id = PTHREAD_NULL;
         s->ring = NULL;
 
         pthread_mutex_init(&s->lock, NULL);
@@ -179,7 +181,7 @@ void audio_export_destroy(struct audio_export *s)
         if (s == NULL) {
                 return;
         }
-        if (s->thread_id) {
+        if (!pthread_equal(s->thread_id, PTHREAD_NULL)) {
                 pthread_mutex_lock(&s->lock);
                 s->should_exit_worker = true;
                 s->new_work_ready     = true;

src/compat/misc.h

@@ -6,7 +6,7 @@
  * in a separate file.
  */
 /*
- * Copyright (c) 2021-2024 CESNET
+ * Copyright (c) 2021-2025 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -63,5 +63,12 @@
         #endif // !defined _WIN32
 #endif // defined WANT_FSEEKO
 
+#ifdef WANT_PTHREAD_NULL
+        #include <pthread.h>
+        #ifndef PTHREAD_NULL // defined by POSIX v8
+                #define PTHREAD_NULL ((pthread_t) { 0 })
+        #endif
+#endif
+
 #endif // defined COMPAT_MISC_H_20C709DB_F4A8_4744_A0A9_96036B277011
 

src/video_capture/rtsp.c

@@ -62,9 +62,11 @@
 #include <unistd.h>                // for unlink
 #endif // defined _WIN32
 
+#define WANT_PTHREAD_NULL
 #include "audio/types.h"
 #include "config.h"                // for PACKAGE_BUGREPORT
 #include "compat/aligned_malloc.h" // for alignde_free, aligned_alloc
+#include "compat/misc.h"           // for PTHREAD_NULL
 #include "compat/strings.h"        // for strncasecmp
 #include "debug.h"
 #include "host.h"
@@ -604,6 +606,8 @@ vidcap_rtsp_init(struct vidcap_params *params, void **state) {
     if (s == NULL) {
         return VIDCAP_INIT_FAIL;
     }
+    s->artsp_state.artsp_thread_id = PTHREAD_NULL;
+    s->vrtsp_state.vrtsp_thread_id = PTHREAD_NULL;
 
     //TODO now static codec assignment, to be dynamic as a function of supported codecs
     s->vrtsp_state.codec[0] = '\0';
@@ -1205,10 +1209,10 @@ vidcap_rtsp_done(void *state) {
     pthread_cond_signal(&s->keepalive_cv);
     pthread_cond_signal(&s->vrtsp_state.worker_cv);
 
-    if (s->vrtsp_state.vrtsp_thread_id) {
+    if (!pthread_equal(s->vrtsp_state.vrtsp_thread_id, PTHREAD_NULL)) {
         pthread_join(s->vrtsp_state.vrtsp_thread_id, NULL);
     }
-    if (s->keep_alive_rtsp_thread_id) {
+    if (!pthread_equal(s->keep_alive_rtsp_thread_id, PTHREAD_NULL)) {
         pthread_join(s->keep_alive_rtsp_thread_id, NULL);
     }
 

src/video_capture/screen_x11.c

@@ -3,7 +3,7 @@
  * @author Martin Pulec     <[email protected]>
  */
 /*
- * Copyright (c) 2012-2023 CESNET, z.s.p.o.
+ * Copyright (c) 2012-2025 CESNET, zájmové sdružení právnických osob
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -57,6 +57,8 @@
 #include <string.h>                // for strchr, strstr, strcat, strdup
 #include <sys/time.h>              // for gettimeofday, timeval
 
+#define WANT_PTHREAD_NULL
+#include "compat/misc.h"           // for PTHRAD_NLLL
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
@@ -341,6 +343,7 @@ static int vidcap_screen_x11_init(struct vidcap_params *params, void **state)
                 return VIDCAP_INIT_FAIL;
         }
         s->cpu_count = get_cpu_core_count();
+        s->worker_id = PTHREAD_NULL;
 
 #ifndef HAVE_XFIXES
         fprintf(stderr, "[Screen capture] Compiled without XFixes library, cursor won't be shown!\n");
@@ -376,7 +379,7 @@ static void vidcap_screen_x11_finish(void *state)
 
         pthread_mutex_unlock(&s->lock);
 
-        if(s->worker_id) {
+        if (!pthread_equal(s->worker_id, PTHREAD_NULL)) {
                 pthread_join(s->worker_id, NULL);
         }
 }

src/video_capture/testcard2.c

@@ -68,7 +68,9 @@
 #        endif // defined HAVE_SDL3
 #endif
 
+#define WANT_PTHREAD_NULL
 #include "audio/types.h"                // for audio_frame
+#include "compat/misc.h"                // for PTHREAD_NULL
 #include "compat/platform_semaphore.h"  // for platform_sem_post, platform_s...
 #include "compat/usleep.h"              // for usleep
 #include "debug.h"                      // for log_msg, LOG_LEVEL_ERROR, LOG...
@@ -106,11 +108,6 @@ enum {
         (struct video_desc){ 1920, 1080, UYVY, 24, PROGRESSIVE, 1 }
 #define MOD_NAME "[testcard2] "
 
-// compat
-#ifndef PTHREAD_NULL // defined by POSIX v8
-#define PTHREAD_NULL ((pthread_t) { 0 })
-#endif
-
 static void vidcap_testcard2_done(void *state);
 void * vidcap_testcard2_thread(void *args);