wav_{reader,writer}: IWYU

Author: MartinPulec

src/audio/wav_reader.c

@@ -35,19 +35,19 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif // HAVE_CONFIG_H
-
+#include <assert.h>
+#include <errno.h>
 #include <inttypes.h>
 #include <limits.h>
 #include <stdbool.h>
 #include <stdint.h>
+#include <stdio.h>
+#include <string.h>
 
 #include "audio/utils.h"
 #include "audio/wav_reader.h"
+#define WANT_FSEEKO64
+#include "compat/misc.h"
 #include "debug.h"
 #include "utils/macros.h"
 #include "utils/misc.h"
@@ -144,8 +144,8 @@ static _Bool is_member(const char *needle, const char **haystack) {
         return 0;
 }
 
-static int fskip(FILE *f, long off) {
-        if (_fseeki64(f, off, SEEK_CUR) == 0) {
+static int fskip(FILE *f, long long  off) {
+        if (fseeko(f, off, SEEK_CUR) == 0) {
                 return 1;
         }
         while (off-- > 0) {
@@ -162,21 +162,21 @@ static _Bool process_data_chunk(FILE *wav_file, uint32_t chunk_size, struct wav_
         if (!found_ds64_chunk) { // RF64 has this chunk size always -1, value from ds64 is used instead
                 metadata->data_size = chunk_size;
         }
-        metadata->data_offset = _ftelli64(wav_file);
+        metadata->data_offset = ftello(wav_file);
         if (metadata->data_size != UINT32_MAX || metadata->data_offset == -1) {
                 return 1;
         }
 
         // for UINT32_MAX deduce the length from file length (as FFmpeg does)
-        if (_fseeki64(wav_file, 0, SEEK_END) != 0) {
+        if (fseeko(wav_file, 0, SEEK_END) != 0) {
                 return 1;
         }
-        int64_t data_end = _ftelli64(wav_file);
+        int64_t data_end = ftello(wav_file);
         if (data_end == -1) {
                 ug_perror(MOD_NAME "cannot get length of file");
                return 0;
         }
-        if (_fseeki64(wav_file, metadata->data_offset, SEEK_SET) != 0) {
+        if (fseeko(wav_file, metadata->data_offset, SEEK_SET) != 0) {
                 ug_perror(MOD_NAME "cannot seek back to data chunk");
                 return 0;
         }

src/audio/wav_writer.c

@@ -58,18 +58,17 @@
  * also follows the above rules.
  */
 
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#include "config_unix.h"
-#include "config_win32.h"
-#endif /* HAVE_CONFIG_H */
-
+#include <errno.h>        // for errno
+#include <limits.h>       // for CHAR_BIT
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+#include "audio/types.h"  // for audio_desc
 #include "audio/utils.h"
 #include "audio/wav_writer.h"
+#define WANT_FSEEKO64
+#include "compat/misc.h"  // for fseeko, ftello
 
 /* Chunk size: 4 + 24 + (8 + M * Nc * Ns + (0 or 1)) */
 #define CK_MASTER_SIZE_OFFSET            4
@@ -177,7 +176,7 @@ bool wav_writer_close(struct wav_writer_file *wav)
                 }
         }
 
-        int64_t ret = _fseeki64(wav->outfile, CK_MASTER_SIZE_OFFSET, SEEK_SET);
+        int64_t ret = fseeko(wav->outfile, CK_MASTER_SIZE_OFFSET, SEEK_SET);
         if (ret != 0) {
                 goto error;
         }
@@ -193,7 +192,7 @@ bool wav_writer_close(struct wav_writer_file *wav)
                 goto error;
         }
 
-        ret = _fseeki64(wav->outfile, CK_DATA_SIZE_OFFSET, SEEK_SET);
+        ret = fseeko(wav->outfile, CK_DATA_SIZE_OFFSET, SEEK_SET);
         if (ret != 0) {
                 goto error;
         }

src/audio/wav_writer.h

@@ -38,19 +38,15 @@
 #ifndef WAV_WRITER_H_722362F0_155A_11EC_88ED_B7401531ECA5
 #define WAV_WRITER_H_722362F0_155A_11EC_88ED_B7401531ECA5
 
-#ifdef __cplusplus
-#include <cstdio>
-#else
+#ifndef __cplusplus
 #include <stdbool.h>
-#include <stdio.h>
 #endif
 
-#include "audio/types.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct audio_desc;
 struct wav_writer_file;
 
 /**

src/compat/misc.h

@@ -50,5 +50,18 @@
 #endif
 #endif // defined WANT_MKDIR
 
+#ifdef WANT_FSEEKO64
+        #include <stdio.h>
+        #ifdef _WIN32
+                #define ftello _ftelli64
+                #define fseeko _fseeki64
+        #else
+                #ifndef __cplusplus
+                        #include <assert.h> // static_assert macro (until c32)
+                #endif
+                static_assert(sizeof(off_t) > 4, "32b off_t");
+        #endif // !defined _WIN32
+#endif // defined WANT_FSEEKO
+
 #endif // defined COMPAT_MISC_H_20C709DB_F4A8_4744_A0A9_96036B277011
 

src/config_unix.h

@@ -170,9 +170,6 @@ typedef int     fd_t;
 #define INVALID_SOCKET (-1)
 #define CLOSESOCKET close
 
-#define _ftelli64 ftell
-#define _fseeki64 fseek
-
 #ifdef __cplusplus
 #define CONF_NIX_EXT_C extern "C"
 #else