MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-04-15 16:48:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixup - remove unused enum, remove unused local variable, remove

Browse Source 
duplicate error log for failure in create_virtual_path, remove
unnecessary empty lines
This commit is contained in:
chme 2016-01-20 20:42:43 +01:00
parent be873d69c6
commit c23cbde6ac
3 changed files with 4 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/filescanner.c
View File

@ -121,12 +121,6 @@ struct stacked_dir {
struct stacked_dir *next; struct stacked_dir *next;
}; };
enum root_directories {
DIR_FILE = 0,
DIR_HTTP = 1,
DIR_SPOTIFY = 2,
};
static int cmd_pipe[2]; static int cmd_pipe[2];
static int exit_pipe[2]; static int exit_pipe[2];
static int scan_exit; static int scan_exit;
@ -984,7 +978,6 @@ process_directory(char *path, int flags, int parent_id)
struct kevent kev; struct kevent kev;
#endif #endif
int type; int type;
struct directory_info di;
char virtual_path[PATH_MAX]; char virtual_path[PATH_MAX];
int dir_id; int dir_id;
int ret; int ret;
@ -1000,21 +993,15 @@ process_directory(char *path, int flags, int parent_id)
} }
/* Add/update directories table */ /* Add/update directories table */
memset(&di, 0, sizeof(struct directory_info));
ret = create_virtual_path(path, virtual_path, sizeof(virtual_path)); ret = create_virtual_path(path, virtual_path, sizeof(virtual_path));
if (ret < 0) if (ret < 0)
{
DPRINTF(E_LOG, L_SCAN, "Virtual path /file:%s, PATH_MAX exceeded\n", path);
return; return;
}
dir_id = db_directory_addorupdate(virtual_path, 0, parent_id); dir_id = db_directory_addorupdate(virtual_path, 0, parent_id);
if (dir_id <= 0) if (dir_id <= 0)
{ {
DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '/http:'\n"); DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '%s'\n", virtual_path);
} }
/* Check if compilation and/or podcast directory */ /* Check if compilation and/or podcast directory */
@ -1180,13 +1167,9 @@ process_parent_directories(char *path)
ret = create_virtual_path(buf, virtual_path, sizeof(virtual_path)); ret = create_virtual_path(buf, virtual_path, sizeof(virtual_path));
if (ret < 0) if (ret < 0)
{
DPRINTF(E_LOG, L_SCAN, "Virtual path /file:%s, PATH_MAX exceeded\n", path);
return 0; return 0;
}
dir_id = db_directory_addorupdate(virtual_path, 0, dir_id); dir_id = db_directory_addorupdate(virtual_path, 0, dir_id);
if (dir_id <= 0) if (dir_id <= 0)
{ {
DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '%s'\n", virtual_path); DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '%s'\n", virtual_path);
@ -1651,9 +1634,7 @@ process_inotify_file(struct watch_info *wi, char *path, struct inotify_event *ie
dir[(ptr - dir)] = '\0'; dir[(ptr - dir)] = '\0';
ret = create_virtual_path(dir, dir_vpath, sizeof(dir_vpath)); ret = create_virtual_path(dir, dir_vpath, sizeof(dir_vpath));
if (ret < 0) if (ret >= 0)
DPRINTF(E_LOG, L_SCAN, "Error creating virtual path for: %s\n", dir);
else
{ {
dir_id = db_directory_id_byvirtualpath(dir_vpath); dir_id = db_directory_id_byvirtualpath(dir_vpath);
if (dir_id > 0) if (dir_id > 0)

1
src/filescanner_playlist.c
View File

@ -240,7 +240,6 @@ scan_playlist(char *file, time_t mtime, int dir_id)
DPRINTF(E_INFO, L_SCAN, "Playlist has EXTINF metadata, artist is '%s', title is '%s'\n", mfi.artist, mfi.title); DPRINTF(E_INFO, L_SCAN, "Playlist has EXTINF metadata, artist is '%s', title is '%s'\n", mfi.artist, mfi.title);
di_id = db_directory_addorupdate("/http:", 0, 1); di_id = db_directory_addorupdate("/http:", 0, 1);
if (di_id <= 0) if (di_id <= 0)
{ {
DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '/http:'\n"); DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '/http:'\n");

1
src/spotify.c
View File

@ -783,7 +783,6 @@ spotify_playlist_save(sp_playlist *pl)
} }
dir_id = db_directory_addorupdate("/spotify:", 0, 1); dir_id = db_directory_addorupdate("/spotify:", 0, 1);
if (dir_id <= 0) if (dir_id <= 0)
{ {
DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '/spotify:'\n"); DPRINTF(E_LOG, L_SCAN, "Insert or update of directory failed '/spotify:'\n");