More clean-up of the C helper code

Signed-off-by: Krzysztof Wilczyński <[email protected]>

Author: kwilczynski

common.h

@@ -9,6 +9,10 @@
 # define _BSD_SOURCE 1
 #endif
 
+#if !defined(_DEFAULT_SOURCE)
+# define _DEFAULT_SOURCE 1
+#endif
+
 #if defined(__cplusplus)
 extern "C" {
 #endif

functions.c

@@ -204,7 +204,7 @@ magic_open_wrapper(int flags)
 inline void
 magic_close_wrapper(magic_t magic)
 {
-	(void)magic_close(magic);
+	magic_close(magic);
 }
 
 inline const char*
@@ -268,69 +268,83 @@ magic_setflags_wrapper(magic_t magic, int flags)
 }
 
 inline int
-magic_load_wrapper(magic_t magic, const char *magicfile, int flags)
+magic_load_wrapper(magic_t magic, const char *magic_file, int flags)
 {
 	int rv;
-	MAGIC_FUNCTION(magic_load, rv, flags, magic, magicfile);
+
+	MAGIC_FUNCTION(magic_load, rv, flags, magic, magic_file);
+
 	return rv;
 }
 
 inline int
 magic_load_buffers_wrapper(magic_t magic, void **buffers, size_t *sizes, size_t count, int flags)
 {
 	int rv;
+
 	MAGIC_FUNCTION(magic_load_buffers, rv, flags, magic, buffers, sizes, count);
+
 	return rv;
 }
 
 inline int
-magic_compile_wrapper(magic_t magic, const char *magicfile, int flags)
+magic_compile_wrapper(magic_t magic, const char *magic_file, int flags)
 {
 	int rv;
-	MAGIC_FUNCTION(magic_compile, rv, flags, magic, magicfile);
+
+	MAGIC_FUNCTION(magic_compile, rv, flags, magic, magic_file);
+
 	return rv;
 }
 
 inline int
-magic_check_wrapper(magic_t magic, const char *magicfile, int flags)
+magic_check_wrapper(magic_t magic, const char *magic_file, int flags)
 {
 	int rv;
-	MAGIC_FUNCTION(magic_check, rv, flags, magic, magicfile);
+
+	MAGIC_FUNCTION(magic_check, rv, flags, magic, magic_file);
+
 	return rv;
 }
 
 inline const char*
 magic_file_wrapper(magic_t magic, const char* filename, int flags)
 {
 	const char *cstring;
+
 	MAGIC_FUNCTION(magic_file, cstring, flags, magic, filename);
+
 	return cstring;
 }
 
 inline const char*
 magic_buffer_wrapper(magic_t magic, const void *buffer, size_t size, int flags)
 {
 	const char *cstring;
+
 	MAGIC_FUNCTION(magic_buffer, cstring, flags, magic, buffer, size);
+
 	return cstring;
 }
 
 inline const char*
 magic_descriptor_wrapper(magic_t magic, int fd, int flags)
 {
-	const char *cstring;
 	int local_errno;
+	const char *cstring;
 
 	if (check_fd(fd) < 0) {
 		local_errno = errno;
 		goto out;
 	}
 
 	MAGIC_FUNCTION(magic_descriptor, cstring, flags, magic, fd);
+
 	return cstring;
 
 out:
 	errno = local_errno;
+
 	return NULL;
 }
 

functions.h

@@ -7,16 +7,16 @@ extern "C" {
 
 #include "common.h"
 
-#define MAGIC_FUNCTION(f, r, x, ...)				\
-	do {							\
-		if ((x) & MAGIC_DEBUG)				\
-			r = f(__VA_ARGS__);			\
-		else {						\
-			save_t __e_##f;				\
-			override_error_output(&(__e_##f));	\
-			r = f(__VA_ARGS__);			\
-			restore_error_output(&(__e_##f));	\
-		}						\
+#define MAGIC_FUNCTION(f, r, x, ...)			   \
+	do {						   \
+		if ((x) & MAGIC_DEBUG)			   \
+			r = f(__VA_ARGS__);		   \
+		else {					   \
+			save_t __e_##f;			   \
+			override_error_output(&(__e_##f)); \
+			r = f(__VA_ARGS__);		   \
+			restore_error_output(&(__e_##f));  \
+		}					   \
 	} while(0)
 
 typedef struct file_data {
@@ -48,12 +48,12 @@ extern int magic_setparam_wrapper(magic_t magic, int parameter,
 extern int magic_getflags_wrapper(magic_t magic);
 extern int magic_setflags_wrapper(magic_t magic, int flags);
 
-extern int magic_load_wrapper(magic_t magic, const char *magicfile, int flags);
+extern int magic_load_wrapper(magic_t magic, const char *magic_file, int flags);
 extern int magic_load_buffers_wrapper(magic_t magic, void **buffers,
 				      size_t *sizes, size_t count, int flags);
 
-extern int magic_compile_wrapper(magic_t magic, const char *magicfile, int flags);
-extern int magic_check_wrapper(magic_t magic, const char *magicfile, int flags);
+extern int magic_compile_wrapper(magic_t magic, const char *magic_file, int flags);
+extern int magic_check_wrapper(magic_t magic, const char *magic_file, int flags);
 
 extern const char* magic_file_wrapper(magic_t magic, const char *filename,
 				      int flags);