diff options
| author | Max Kellermann <max@duempel.org> | 2008-10-08 11:07:58 +0200 |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2008-10-11 19:21:48 -0700 |
| commit | a76121ea81f452c0d5e21d6a2fb6f200a80faf7b (patch) | |
| tree | e59b04f16d56532284747f99fb5631cfd6b24c70 /src/update.c | |
| parent | 4629f646077109f7c6185aab92560da52c237412 (diff) | |
| download | mpd-a76121ea81f452c0d5e21d6a2fb6f200a80faf7b.tar.gz mpd-a76121ea81f452c0d5e21d6a2fb6f200a80faf7b.tar.xz mpd-a76121ea81f452c0d5e21d6a2fb6f200a80faf7b.zip | |
directory: eliminate CamelCase
CamelCase is ugly, rename the functions.
[ew: "directory_get_directory" was too confusing, using
"directory_get_subdir" instead (old function was named
"getSubDirectory")]
Diffstat (limited to 'src/update.c')
| -rw-r--r-- | src/update.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/update.c b/src/update.c index 52e61167d..989b8f943 100644 --- a/src/update.c +++ b/src/update.c @@ -135,7 +135,7 @@ static int statDirectory(struct directory *dir) { struct stat st; - if (myStat(getDirectoryPath(dir), &st) < 0) + if (myStat(directory_get_path(dir), &st) < 0) return -1; directory_set_stat(dir, &st); @@ -168,11 +168,11 @@ addSubDirectoryToDirectory(struct directory *directory, if (inodeFoundInParent(directory, st->st_ino, st->st_dev)) return UPDATE_RETURN_NOUPDATE; - subDirectory = newDirectory(name, directory); + subDirectory = directory_new(name, directory); directory_set_stat(subDirectory, st); if (updateDirectory(subDirectory) != UPDATE_RETURN_UPDATED) { - freeDirectory(subDirectory); + directory_free(subDirectory); return UPDATE_RETURN_NOUPDATE; } @@ -254,7 +254,7 @@ enum update_return updateDirectory(struct directory *directory) { int was_empty = directory_is_empty(directory); DIR *dir; - const char *dirname = getDirectoryPath(directory); + const char *dirname = directory_get_path(directory); struct dirent *ent; char path_max_tmp[MPD_PATH_MAX]; enum update_return ret = UPDATE_RETURN_NOUPDATE; @@ -327,7 +327,7 @@ static struct directory * addDirectoryPathToDB(const char *utf8path) inodeFoundInParent(parentDirectory, st.st_ino, st.st_dev)) return NULL; else { - directory = newDirectory(utf8path, parentDirectory); + directory = directory_new(utf8path, parentDirectory); dirvec_add(&parentDirectory->children, directory); } } @@ -378,7 +378,7 @@ static enum update_return updatePath(const char *utf8path) /* if this update directory is successfull, we are done */ if ((ret = updateDirectory(directory)) >= 0) { - sortDirectory(directory); + directory_sort(directory); return ret; } /* we don't want to delete the root directory */ |