oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

playlist/pls: make variables more local

This commit is contained in:
Max Kellermann 2014-01-08 19:30:10 +01:00
parent b2e1b38864
commit 3b568b0943
1 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/playlist/PlsPlaylistPlugin.cxx
View File

@ -40,7 +40,6 @@ static void
pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs) pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
{ {
gchar *value; gchar *value;
int length;
GError *error = nullptr; GError *error = nullptr;
int num_entries = g_key_file_get_integer(keyfile, "playlist", int num_entries = g_key_file_get_integer(keyfile, "playlist",
"NumberOfEntries", &error); "NumberOfEntries", &error);
@ -60,8 +59,6 @@ pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
} }
for (; num_entries > 0; --num_entries) { for (; num_entries > 0; --num_entries) {
Song *song;
char key[64]; char key[64];
sprintf(key, "File%u", num_entries); sprintf(key, "File%u", num_entries);
value = g_key_file_get_string(keyfile, "playlist", key, value = g_key_file_get_string(keyfile, "playlist", key,
@ -74,7 +71,7 @@ pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
return; return;
} }
song = Song::NewRemote(value); Song *song = Song::NewRemote(value);
g_free(value); g_free(value);
TagBuilder tag; TagBuilder tag;
@ -88,8 +85,8 @@ pls_parser(GKeyFile *keyfile, std::forward_list<SongPointer> &songs)
g_free(value); g_free(value);
sprintf(key, "Length%u", num_entries); sprintf(key, "Length%u", num_entries);
length = g_key_file_get_integer(keyfile, "playlist", key, int length = g_key_file_get_integer(keyfile, "playlist", key,
nullptr); nullptr);
if (length > 0) if (length > 0)
tag.SetTime(length); tag.SetTime(length);
@ -104,15 +101,12 @@ pls_open_stream(InputStream &is)
{ {
GError *error = nullptr; GError *error = nullptr;
Error error2; Error error2;
size_t nbytes;
char buffer[1024];
bool success;
GKeyFile *keyfile;
std::string kf_data; std::string kf_data;
do { do {
nbytes = is.LockRead(buffer, sizeof(buffer), error2); char buffer[1024];
size_t nbytes = is.LockRead(buffer, sizeof(buffer), error2);
if (nbytes == 0) { if (nbytes == 0) {
if (error2.IsDefined()) { if (error2.IsDefined()) {
LogError(error2); LogError(error2);
@ -131,12 +125,10 @@ pls_open_stream(InputStream &is)
return nullptr; return nullptr;
} }
keyfile = g_key_file_new(); GKeyFile *keyfile = g_key_file_new();
success = g_key_file_load_from_data(keyfile, if (!g_key_file_load_from_data(keyfile,
kf_data.data(), kf_data.length(), kf_data.data(), kf_data.length(),
G_KEY_FILE_NONE, &error); G_KEY_FILE_NONE, &error)) {
if (!success) {
FormatError(pls_domain, FormatError(pls_domain,
"KeyFile parser failed: %s", error->message); "KeyFile parser failed: %s", error->message);
g_error_free(error); g_error_free(error);