MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2025-01-28 15:06:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

[filescanner] Switch argument order (input first)

Browse Source
This commit is contained in:
chme 2017-03-18 09:42:54 +01:00 committed by ejurgensen
parent 888710612c
commit cc29c617b0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/library/filescanner.c
View File

@ -613,10 +613,10 @@ create_virtual_path(char *path, char *virtual_path, int virtual_path_len)
* and resolved_path contains the resolved path (resolved_path must be of length PATH_MAX). * and resolved_path contains the resolved path (resolved_path must be of length PATH_MAX).
* If path is not a symbolic link, resolved_path holds the same value as path. * If path is not a symbolic link, resolved_path holds the same value as path.
* *
* The return value is 0 if the operation is successful, or -1 on failure. In addition * The return value is 0 if the operation is successful, or -1 on failure
*/ */
static int static int
read_attributes(const char *path, struct stat *sb, char *resolved_path) read_attributes(char *resolved_path, const char *path, struct stat *sb)
{ {
int ret; int ret;
@ -723,7 +723,7 @@ process_directory(char *path, int parent_id, int flags)
continue; continue;
} }
ret = read_attributes(entry, &sb, resolved_path); ret = read_attributes(resolved_path, entry, &sb);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_SCAN, "Skipping %s, read_attributes() failed\n", entry); DPRINTF(E_LOG, L_SCAN, "Skipping %s, read_attributes() failed\n", entry);
@ -1254,7 +1254,7 @@ process_inotify_file(struct watch_info *wi, char *path, struct inotify_event *ie
incomingfiles_buffer[i] = 0; incomingfiles_buffer[i] = 0;
} }
ret = read_attributes(path, &sb, resolved_path); ret = read_attributes(resolved_path, path, &sb);
if (ret < 0) if (ret < 0)
{ {
DPRINTF(E_LOG, L_SCAN, "Skipping %s, read_attributes() failed\n", path); DPRINTF(E_LOG, L_SCAN, "Skipping %s, read_attributes() failed\n", path);

4
src/library/filescanner_playlist.c
View File

@ -122,7 +122,7 @@ process_url(const char *path, time_t mtime, int extinf, struct media_file_info *
} }
static int static int
process_regular_file(char *path, char **filename) process_regular_file(char **filename, char *path)
{ {
int i; int i;
int mfi_id; int mfi_id;
@ -333,7 +333,7 @@ scan_playlist(char *file, time_t mtime, int dir_id)
/* Regular file, should already be in library */ /* Regular file, should already be in library */
else else
{ {
ret = process_regular_file(path, &plitem_path); ret = process_regular_file(&plitem_path, path);
} }
if (ret == 0) if (ret == 0)