changeset 2474:f2b3cdb6e7dc

Remove some useless wrapping of functions.

--- a/src/sid/xs_support.c	Sun Mar 30 00:59:41 2008 +0200
+++ b/src/sid/xs_support.c	Sun Mar 30 01:16:00 2008 +0200
@@ -24,58 +24,6 @@
 #include <ctype.h>
 
 
-#ifndef __AUDACIOUS_NEWVFS__
-/* File handling
- */
-t_xs_file *xs_fopen(const gchar *path, const gchar *mode)
-{
-	return fopen(path, mode);
-}
-
-
-gint xs_fclose(t_xs_file *f)
-{
-	return fclose(f);
-}
-
-
-gint xs_fgetc(t_xs_file *f)
-{
-	return fgetc(f);
-}
-
-
-size_t xs_fread(void *p, size_t s, size_t n, t_xs_file *f)
-{
-	return fread(p, s, n, f);
-}
-
-
-gint xs_feof(t_xs_file *f)
-{
-	return feof(f);
-}
-
-
-gint xs_ferror(t_xs_file *f)
-{
-	return ferror(f);
-}
-
-
-glong xs_ftell(t_xs_file *f)
-{
-	return ftell(f);
-}
-
-
-gint xs_fseek(t_xs_file *f, glong o, gint w)
-{
-	return fseek(f, o, w);
-}
-#endif
-
-
 guint16 xs_fread_be16(t_xs_file *f)
 {
 	return (((guint16) xs_fgetc(f)) << 8) | ((guint16) xs_fgetc(f));
@@ -139,9 +87,6 @@
 }
 
 
-
-
-
 /* Copy a string
  */
 gchar *xs_strncpy(gchar *pDest, const gchar *pSource, size_t n)

--- a/src/sid/xs_support.h	Sun Mar 30 00:59:41 2008 +0200
+++ b/src/sid/xs_support.h	Sun Mar 30 01:16:00 2008 +0200
@@ -80,14 +80,14 @@
 #define xs_fseek(a,b,c) aud_vfs_fseek(a,b,c)
 #else
 #define t_xs_file FILE
-t_xs_file *xs_fopen(const gchar *, const gchar *);
-gint	xs_fclose(t_xs_file *);
-gint	xs_fgetc(t_xs_file *);
-size_t	xs_fread(void *, size_t, size_t, t_xs_file *);
-gint	xs_feof(t_xs_file *);
-gint	xs_ferror(t_xs_file *);
-glong	xs_ftell(t_xs_file *);
-gint	xs_fseek(t_xs_file *, glong, gint);
+#define xs_fopen(a,b)fopen(a,b)
+#define xs_fclose(a) fclose(a)
+#define xs_fgetc(a) fgetc(a)
+#define xs_fread(a,b,c,d) fread(a,b,c,d)
+#define xs_feof(a) feof(a)
+#define xs_ferror(a) ferror(a)
+#define xs_ftell(a) ftell(a)
+#define xs_fseek(a,b,c) fseek(a,b,c)
 #endif
 guint16 xs_fread_be16(t_xs_file *);
 guint32 xs_fread_be32(t_xs_file *);