aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Wong <normalperson@yhbt.net>2008-09-29 02:58:29 -0700
committerEric Wong <normalperson@yhbt.net>2008-09-29 03:04:29 -0700
commitdde461fe6e012a62ee47cf5f3bfc022b650b6bf5 (patch)
tree9fb54df1a1e432eabded91c4c36f387690d504e8 /src
parent659a543da853bcb28c22df300a93bd22dc9ae877 (diff)
downloadmpd-dde461fe6e012a62ee47cf5f3bfc022b650b6bf5.tar.gz
mpd-dde461fe6e012a62ee47cf5f3bfc022b650b6bf5.tar.xz
mpd-dde461fe6e012a62ee47cf5f3bfc022b650b6bf5.zip
directory: remove redundant sanitizePathDup
We already sanitize and duplicated our paths before calling updateInit() to get pre-pthread_create() error-checking along with heap allocation reduction because we don't have to redupe because our parent stack went away.
Diffstat (limited to 'src')
-rw-r--r--src/directory.c22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/directory.c b/src/directory.c
index 8d36985dc..fc9c6b41d 100644
--- a/src/directory.c
+++ b/src/directory.c
@@ -377,41 +377,36 @@ static enum update_return updatePath(const char *utf8path)
Directory *directory;
Directory *parentDirectory;
Song *song;
- char *path = sanitizePathDup(utf8path);
time_t mtime;
enum update_return ret = UPDATE_RETURN_NOUPDATE;
char path_max_tmp[MPD_PATH_MAX];
- if (NULL == path)
- return UPDATE_RETURN_ERROR;
+ assert(utf8path);
/* if path is in the DB try to update it, or else delete it */
- if ((directory = getDirectory(path))) {
+ if ((directory = getDirectory(utf8path))) {
parentDirectory = directory->parent;
/* if this update directory is successfull, we are done */
if ((ret = updateDirectory(directory)) >= 0) {
- free(path);
sortDirectory(directory);
return ret;
}
/* we don't want to delete the root directory */
else if (directory == music_root) {
- free(path);
return UPDATE_RETURN_NOUPDATE;
}
/* if updateDirectory fails, means we should delete it */
else {
- LOG("removing directory: %s\n", path);
+ LOG("removing directory: %s\n", utf8path);
dirvec_delete(&parentDirectory->children, directory);
ret = UPDATE_RETURN_UPDATED;
/* don't return, path maybe a song now */
}
- } else if ((song = getSongFromDB(path))) {
+ } else if ((song = getSongFromDB(utf8path))) {
parentDirectory = song->parentDir;
if (!parentDirectory->stat
&& statDirectory(parentDirectory) < 0) {
- free(path);
return UPDATE_RETURN_NOUPDATE;
}
/* if this song update is successful, we are done */
@@ -419,7 +414,6 @@ static enum update_return updatePath(const char *utf8path)
parentDirectory->inode,
parentDirectory->device) &&
isMusic(get_song_url(path_max_tmp, song), &mtime, 0)) {
- free(path);
if (song->mtime == mtime)
return UPDATE_RETURN_NOUPDATE;
else if (updateSongInfo(song) == 0)
@@ -442,21 +436,19 @@ static enum update_return updatePath(const char *utf8path)
* Also, if by chance a directory was replaced by a file of the same
* name or vice versa, we need to add it to the db
*/
- if (isDir(path) || isMusic(path, NULL, 0)) {
- parentDirectory = addParentPathToDB(path);
+ if (isDir(utf8path) || isMusic(utf8path, NULL, 0)) {
+ parentDirectory = addParentPathToDB(utf8path);
if (!parentDirectory || (!parentDirectory->stat &&
statDirectory(parentDirectory) < 0)) {
} else if (0 == inodeFoundInParent(parentDirectory->parent,
parentDirectory->inode,
parentDirectory->device)
- && addToDirectory(parentDirectory, path)
+ && addToDirectory(parentDirectory, utf8path)
> 0) {
ret = UPDATE_RETURN_UPDATED;
}
}
- free(path);
-
return ret;
}