From 93b8da7e8aa8acd8751333d07006129acba168bb Mon Sep 17 00:00:00 2001
From: Kim Woelders <kim@woelders.dk>
Date: Tue, 20 Apr 2021 09:05:15 +0200
Subject: [PATCH] Move Eexec() and friends to util.h

Seems more appropriate.

And add missing __PRINTF__ on Espawn() prototype.
---
 src/E.h            | 8 --------
 src/sound_player.c | 2 +-
 src/util.h         | 8 ++++++++
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/E.h b/src/E.h
index 5844f8ea..0fa3275b 100644
--- a/src/E.h
+++ b/src/E.h
@@ -442,14 +442,6 @@ typedef struct {
 /* about.c */
 void                About(void);
 
-/* actions.c */
-#define EXEC_SET_LANG       0x01
-#define EXEC_SET_STARTUP_ID 0x02
-void                Eexec(const char *cmd);
-int                 EspawnApplication(const char *params, int flags);
-void                Espawn(const char *fmt, ...);
-int __PRINTF__      Esystem(const char *fmt, ...);
-
 /* config.c */
 #define FILE_TYPE_CONFIG     0
 #define FILE_TYPE_BACKGROUND 1
diff --git a/src/sound_player.c b/src/sound_player.c
index bc10638c..f996567a 100644
--- a/src/sound_player.c
+++ b/src/sound_player.c
@@ -45,7 +45,7 @@ _sound_player_Destroy(Sample * s)
 static void
 _sound_player_Play(Sample * s)
 {
-   Espawn(SOUND_PLAYER_FMT, s);
+   Espawn(SOUND_PLAYER_FMT, (char *)s);
 }
 
 static int
diff --git a/src/util.h b/src/util.h
index 37660436..c819fc4e 100644
--- a/src/util.h
+++ b/src/util.h
@@ -117,6 +117,14 @@ void __PRINTF__     Eprintf(const char *fmt, ...);
 #define Evsnprintf vsnprintf
 #define Esnprintf snprintf
 
+#define EXEC_SET_LANG       0x01
+#define EXEC_SET_STARTUP_ID 0x02
+
+void                Eexec(const char *cmd);
+int                 EspawnApplication(const char *params, int flags);
+void __PRINTF__     Espawn(const char *fmt, ...);
+int __PRINTF__      Esystem(const char *fmt, ...);
+
 #if USE_MODULES
 /* Dynamic loading */
 const void         *ModLoadSym(const char *lib, const char *sym,