diff options
| author | Max Kellermann <max@duempel.org> | 2009-10-13 18:01:06 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-10-13 18:01:06 +0200 |
| commit | f7ce4f6239ded6681713bc9e8d281712106e6f25 (patch) | |
| tree | 1078ee0df1551a0e27bae71022c39a54affd07b6 /src/songvec.c | |
| parent | 28442cce9fa4a91c38d87c4a61b6ff6af4f97a67 (diff) | |
| download | mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.tar.gz mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.tar.xz mpd-f7ce4f6239ded6681713bc9e8d281712106e6f25.zip | |
song: renamed attribute "url" to "uri"
Diffstat (limited to '')
| -rw-r--r-- | src/songvec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/songvec.c b/src/songvec.c index d78c44ca0..4160f14bc 100644 --- a/src/songvec.c +++ b/src/songvec.c @@ -79,7 +79,7 @@ static int songvec_cmp(const void *s1, const void *s2) return ret; /* still no difference? compare file name */ - return g_utf8_collate(a->url, b->url); + return g_utf8_collate(a->uri, b->uri); } static size_t sv_size(const struct songvec *sv) @@ -108,14 +108,14 @@ void songvec_sort(struct songvec *sv) } struct song * -songvec_find(const struct songvec *sv, const char *url) +songvec_find(const struct songvec *sv, const char *uri) { int i; struct song *ret = NULL; g_mutex_lock(nr_lock); for (i = sv->nr; --i >= 0; ) { - if (strcmp(sv->base[i]->url, url)) + if (strcmp(sv->base[i]->uri, uri)) continue; ret = sv->base[i]; break; @@ -182,7 +182,7 @@ songvec_for_each(const struct songvec *sv, struct song *song = sv->base[i]; assert(song); - assert(*song->url); + assert(*song->uri); prev_nr = sv->nr; g_mutex_unlock(nr_lock); /* fn() may block */ |