Ticket #18381: mp3fs-0.13-macosx.patch

src/class.h

@@ -171 +171 @@
 
 #define CLASS(class,super_class)                        \
   typedef struct class *class;                          \
-  /*inline*/ void class ## _init(void);                 \
+  inline void class ## _init(void);                     \
   void class ## _Alloc(class this);                     \
   extern int __ ## class ## _initialised;               \
   extern struct class __ ## class;                      \
@@ -209 +209 @@
 
 #define VIRTUAL(class,superclass)                               \
   struct class __ ## class;                                     \
-  /*inline*/ void class ## _init(void) {                                        \
+  inline void class ## _init(void) {                                    \
     if(!__ ## class ## _initialised) {                                  \
       class ## _Alloc(&__ ## class);                                    \
       __ ## class ## _initialised = 1;                                  \
@@ -233 +233 @@
 
 #define VIRTUAL(class,superclass)                               \
   struct class __ ## class;                                     \
-  /*inline*/ void class ## _init(void) {                                        \
+  inline void class ## _init(void) {                                    \
     if(!__ ## class ## _initialised) {                                  \
       class ## _Alloc(&__ ## class);                                    \
       __ ## class ## _initialised = 1;                                  \
@@ -348 +348 @@
 #define GET_CLASS(name)                         \
   &__ ## name
 
-/*inline*/ void Object_init(void);
-/*inline*/ void Object_Alloc(Object this);
+inline void Object_init(void);
+inline void Object_Alloc(Object this);
 
 extern struct Object __Object;
 

src/mp3fs.c

@@ -20 +20 @@
   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#define FUSE_USE_VERSION 26
+#define FUSE_USE_VERSION 22
 
 #include <fuse.h>
 #include <stdio.h>
@@ -30 +30 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
-/*#include <sys/statfs.h>*/
+#include <sys/statfs.h>
 
 #include "transcode.h"
 #include "talloc.h"
@@ -56 +56 @@
                          off_t offset, struct fuse_file_info *fi) {
   DIR *dp;
   struct dirent *de;
-        char name[256]; /* *ptr; */
+  char name[256], *ptr;
   
   DEBUG(logfd, "%s: readdir\n", path);
 
@@ -90 +90 @@
 }
 
 static int mp3fs_getattr(const char *path, struct stat *stbuf) {
-  /* int res; */
+  int res;
   FileTranscoder f;
   char name[256];
   int hold_errno;
@@ -161 +161 @@
 static int mp3fs_read(const char *path, char *buf, size_t size, off_t offset,
                       struct fuse_file_info *fi) {
   int fd, res;
-  /* struct stat st; */
+  struct stat st;
   FileTranscoder f=NULL;
   char name[256];
 
@@ -195 +195 @@
   return f->Read(f, buf, offset, size);
 }
 
-static int mp3fs_statfs(const char *path, struct statvfs *stbuf) {
+static int mp3fs_statfs(const char *path, struct statfs *stbuf) {
   int res;
   char name[256];
 
@@ -204 +204 @@
   strncpy(name, basepath, sizeof(name));
   strncat(name, path, sizeof(name) - strlen(name));
 
-  res = statvfs(name, stbuf);
+  res = statfs(name, stbuf);
   if(res == -1)
     return -errno;
   
@@ -269 +269 @@
 #endif
   
   // start FUSE
-  fuse_main(argc-1, argv+1, &mp3fs_ops, NULL);
+  fuse_main(argc-1, argv+1, &mp3fs_ops);
   
 #ifdef __DEBUG__
   fclose(logfd);

src/transcode.c

@@ -24 +24 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <errno.h>
-/*#include <sys/statfs.h>*/
+#include <sys/statfs.h>
 
 #include <FLAC/metadata.h>
 #ifdef LEGACY_FLAC
@@ -159 +159 @@
                                         void *client_data)
 #endif
 {
-  int len, i/*, count*/;
+  int len, i, count;
   FileTranscoder trans = (FileTranscoder)client_data;
   
   if(frame->header.blocksize < 1152) {