summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Lilleengen <lulf@pvv.ntnu.no>2008-08-18 12:42:53 +0200
committerUlf Lilleengen <lulf@pvv.ntnu.no>2008-08-18 12:42:53 +0200
commit30e2bfd314f9ab45bb0b64c3b7647eb3f086cecb (patch)
treee049832e2d4f1afd3952f2c9a6b76edabe70d05a
parentc6cfbc46153744485d2edc110497535e8bccf052 (diff)
- Simplify some messy code.
-rw-r--r--include/musicfs.h2
-rw-r--r--src/mfs_subr.c10
2 files changed, 3 insertions, 9 deletions
diff --git a/include/musicfs.h b/include/musicfs.h
index 4e6aa37..ca5d785 100644
--- a/include/musicfs.h
+++ b/include/musicfs.h
@@ -44,7 +44,7 @@ struct filler_data {
enum lookup_datatype { LIST_DATATYPE_STRING = 1, LIST_DATATYPE_INT };
-enum mfs_filetype { MFS_NOTFOUND, MFS_FILE, MFS_DIRECTORY };
+enum mfs_filetype { MFS_FILE, MFS_DIRECTORY };
/* A lookup functions returns 0 if it's finished. */
typedef int lookup_fn_t(void *, const char *);
diff --git a/src/mfs_subr.c b/src/mfs_subr.c
index 420046b..b6c5815 100644
--- a/src/mfs_subr.c
+++ b/src/mfs_subr.c
@@ -897,8 +897,6 @@ mfs_get_filetype(const char *path) {
return (MFS_DIRECTORY);
case 4:
return (MFS_FILE);
- default:
- return (MFS_NOTFOUND);
}
} else if (strncmp(path, "/Albums", 7) == 0) {
switch (tokens) {
@@ -907,8 +905,6 @@ mfs_get_filetype(const char *path) {
return (MFS_DIRECTORY);
case 3:
return (MFS_FILE);
- default:
- return (MFS_NOTFOUND);
}
} else if (strncmp(path, "/Tracks", 7) == 0) {
switch (tokens) {
@@ -916,10 +912,8 @@ mfs_get_filetype(const char *path) {
return (MFS_DIRECTORY);
case 2:
return (MFS_FILE);
- default:
- return (MFS_NOTFOUND);
}
- } else {
- return (MFS_NOTFOUND);
}
+
+ return (-1);
}