From 30e2bfd314f9ab45bb0b64c3b7647eb3f086cecb Mon Sep 17 00:00:00 2001 From: Ulf Lilleengen Date: Mon, 18 Aug 2008 12:42:53 +0200 Subject: - Simplify some messy code. --- include/musicfs.h | 2 +- src/mfs_subr.c | 10 ++-------- 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); } -- cgit v1.2.3