aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-10-20 22:18:42 +0200
committerMax Kellermann <max@duempel.org>2008-10-20 22:18:42 +0200
commit1d385190a07007ec7c4f7a880ab16ef4fce88cf4 (patch)
tree6a29a2dd7ef62cbb8b9b19f6e228143d91a6c5a5
parent49260e6db20aa865e485a02fae5c0249d1df0d8a (diff)
downloadmpd-1d385190a07007ec7c4f7a880ab16ef4fce88cf4.tar.gz
mpd-1d385190a07007ec7c4f7a880ab16ef4fce88cf4.tar.xz
mpd-1d385190a07007ec7c4f7a880ab16ef4fce88cf4.zip
path: removed pathcpy_trunc()
There was only one user of pathcpy_trunc(), which can be eliminated.
Diffstat (limited to '')
-rw-r--r--src/decoder_thread.c7
-rw-r--r--src/path.c13
-rw-r--r--src/path.h6
3 files changed, 2 insertions, 24 deletions
diff --git a/src/decoder_thread.c b/src/decoder_thread.c
index c8f19a33f..d6171a5fe 100644
--- a/src/decoder_thread.c
+++ b/src/decoder_thread.c
@@ -39,11 +39,8 @@ static void decodeStart(void)
if (song_is_file(song))
map_song_fs(song, path_max_fs);
- else {
- char path_max_utf8[MPD_PATH_MAX];
- song_get_url(song, path_max_utf8);
- pathcpy_trunc(path_max_fs, path_max_utf8);
- }
+ else
+ song_get_url(song, path_max_fs);
dc.current_song = dc.next_song; /* NEED LOCK */
if (openInputStream(&inStream, path_max_fs) < 0) {
diff --git a/src/path.c b/src/path.c
index 5398c7f1a..5b84d3506 100644
--- a/src/path.c
+++ b/src/path.c
@@ -189,19 +189,6 @@ char *rpp2app_r(char *dst, const char *rel_path)
return dst;
}
-/* this is actually like strlcpy (OpenBSD), but we don't actually want to
- * blindly use it everywhere, only for paths that are OK to truncate (for
- * error reporting and such */
-void pathcpy_trunc(char *dest, const char *src)
-{
- size_t len = strlen(src);
-
- if (mpd_unlikely(len >= MPD_PATH_MAX))
- len = MPD_PATH_MAX - 1;
- memcpy(dest, src, len);
- dest[len] = '\0';
-}
-
char *sanitizePathDup(const char *path)
{
int len = strlen(path) + 1;
diff --git a/src/path.h b/src/path.h
index 739985a0c..6b288a26c 100644
--- a/src/path.h
+++ b/src/path.h
@@ -61,12 +61,6 @@ char *rpp2app_r(char *dst, const char *rel_path);
/* strips extra "///" and leading "/" and trailing "/" */
char *sanitizePathDup(const char *path);
-/* this is actually like strlcpy (OpenBSD), but we don't actually want to
- * blindly use it everywhere, only for paths that are OK to truncate (for
- * error reporting and such.
- * dest must be MPD_PATH_MAX bytes large (which is standard in mpd) */
-void pathcpy_trunc(char *dest, const char *src);
-
/*
* converts a path passed from a client into an absolute FS path.
* paths passed by clients do NOT have file suffixes in them