summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorlulf@carrot.studby.ntnu.no <lulf@carrot.studby.ntnu.no>2008-04-20 17:17:17 +0200
committerlulf@carrot.studby.ntnu.no <lulf@carrot.studby.ntnu.no>2008-04-20 17:17:17 +0200
commit0ebfa9027441cc55b79a7615e328a9ff775af11f (patch)
tree518fe6955026cfa72c9b029c214ecfdec406e8bc
parent5e3271e962b13138fe3273f743a65d58c0c8356a (diff)
- Make it work.
-rw-r--r--include/mp3fs.h2
-rwxr-xr-xsrc/mp3_vnops.c4
-rwxr-xr-xsrc/mp3fs.c8
3 files changed, 7 insertions, 7 deletions
diff --git a/include/mp3fs.h b/include/mp3fs.h
index 0956183..4b6cc5d 100644
--- a/include/mp3fs.h
+++ b/include/mp3fs.h
@@ -1,5 +1,5 @@
#ifndef _MP3FS_H_
#define _MP3FS_H_
struct fuse_args;
-int mp3_run(struct fuse_args *);
+int mp3_run(int, char **);
#endif
diff --git a/src/mp3_vnops.c b/src/mp3_vnops.c
index 9d60a98..c9ee97b 100755
--- a/src/mp3_vnops.c
+++ b/src/mp3_vnops.c
@@ -81,8 +81,8 @@ static struct fuse_operations mp3_ops = {
};
int
-mp3_run(struct fuse_args *args)
+mp3_run(int argc, char **argv)
{
- return (fuse_main(args->argc, args->argv, &mp3_ops, NULL));
+ return (fuse_main(argc, argv, &mp3_ops, NULL));
}
diff --git a/src/mp3fs.c b/src/mp3fs.c
index ebc1c27..b8f0ea1 100755
--- a/src/mp3fs.c
+++ b/src/mp3fs.c
@@ -11,18 +11,18 @@
static int mp3fs_opt_proc (void *, const char *, int, struct fuse_args *);
/* Just for testing the argument parsing. TODO: fix something better */
-char *sourcedir = NULL;
+const char *sourcedir = NULL;
int
main(int argc, char **argv)
{
- struct fuse_args args = FUSE_ARGS_INIT (argc, argv);
+/* struct fuse_args args = FUSE_ARGS_INIT (argc, argv);
if (fuse_opt_parse(&args, NULL, NULL, mp3fs_opt_proc) != 0)
- exit (1);
+ exit (1);*/
printf("Starting up mp3fs\n");
- mp3_run(&args);
+ mp3_run(argc, argv);
printf("Shutting down mp3fs\n");
}