From 5d1133925994077d93d37e95565c359e026abfff Mon Sep 17 00:00:00 2001
From: Romain Vimont <rom@rom1v.com>
Date: Fri, 7 Jun 2019 17:19:00 +0200
Subject: [PATCH] Inline lock_util functions

They are just tiny wrappers.
---
 app/meson.build     |  1 -
 app/src/lock_util.c | 48 ----------------------------------------
 app/src/lock_util.h | 53 +++++++++++++++++++++++++++++++++------------
 3 files changed, 39 insertions(+), 63 deletions(-)
 delete mode 100644 app/src/lock_util.c

diff --git a/app/meson.build b/app/meson.build
index 732cf1ee..7781d776 100644
--- a/app/meson.build
+++ b/app/meson.build
@@ -10,7 +10,6 @@ src = [
     'src/file_handler.c',
     'src/fps_counter.c',
     'src/input_manager.c',
-    'src/lock_util.c',
     'src/net.c',
     'src/receiver.c',
     'src/recorder.c',
diff --git a/app/src/lock_util.c b/app/src/lock_util.c
deleted file mode 100644
index 36706063..00000000
--- a/app/src/lock_util.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include <lock_util.h>
-#include <stdlib.h>
-#include <SDL2/SDL_mutex.h>
-
-#include "log.h"
-
-void
-mutex_lock(SDL_mutex *mutex) {
-    if (SDL_LockMutex(mutex)) {
-        LOGC("Could not lock mutex");
-        abort();
-    }
-}
-
-void
-mutex_unlock(SDL_mutex *mutex) {
-    if (SDL_UnlockMutex(mutex)) {
-        LOGC("Could not unlock mutex");
-        abort();
-    }
-}
-
-void
-cond_wait(SDL_cond *cond, SDL_mutex *mutex) {
-    if (SDL_CondWait(cond, mutex)) {
-        LOGC("Could not wait on condition");
-        abort();
-    }
-}
-
-int
-cond_wait_timeout(SDL_cond *cond, SDL_mutex *mutex, uint32_t ms) {
-    int r = SDL_CondWaitTimeout(cond, mutex, ms);
-    if (r < 0) {
-        LOGC("Could not wait on condition with timeout");
-        abort();
-    }
-    return r;
-}
-
-void
-cond_signal(SDL_cond *cond) {
-    if (SDL_CondSignal(cond)) {
-        LOGC("Could not signal a condition");
-        abort();
-    }
-}
-
diff --git a/app/src/lock_util.h b/app/src/lock_util.h
index 6c27602d..d1ca7336 100644
--- a/app/src/lock_util.h
+++ b/app/src/lock_util.h
@@ -2,25 +2,50 @@
 #define LOCKUTIL_H
 
 #include <stdint.h>
+#include <SDL2/SDL_mutex.h>
 
-// forward declarations
-typedef struct SDL_mutex SDL_mutex;
-typedef struct SDL_cond SDL_cond;
+#include "log.h"
 
-void
-mutex_lock(SDL_mutex *mutex);
+static inline void
+mutex_lock(SDL_mutex *mutex) {
+    if (SDL_LockMutex(mutex)) {
+        LOGC("Could not lock mutex");
+        abort();
+    }
+}
 
-void
-mutex_unlock(SDL_mutex *mutex);
+static inline void
+mutex_unlock(SDL_mutex *mutex) {
+    if (SDL_UnlockMutex(mutex)) {
+        LOGC("Could not unlock mutex");
+        abort();
+    }
+}
 
-void
-cond_wait(SDL_cond *cond, SDL_mutex *mutex);
+static inline void
+cond_wait(SDL_cond *cond, SDL_mutex *mutex) {
+    if (SDL_CondWait(cond, mutex)) {
+        LOGC("Could not wait on condition");
+        abort();
+    }
+}
 
-// return 0 or SDL_MUTEX_TIMEDOUT
-int
-cond_wait_timeout(SDL_cond *cond, SDL_mutex *mutex, uint32_t ms);
+static inline int
+cond_wait_timeout(SDL_cond *cond, SDL_mutex *mutex, uint32_t ms) {
+    int r = SDL_CondWaitTimeout(cond, mutex, ms);
+    if (r < 0) {
+        LOGC("Could not wait on condition with timeout");
+        abort();
+    }
+    return r;
+}
 
-void
-cond_signal(SDL_cond *cond);
+static inline void
+cond_signal(SDL_cond *cond) {
+    if (SDL_CondSignal(cond)) {
+        LOGC("Could not signal a condition");
+        abort();
+    }
+}
 
 #endif