aboutsummaryrefslogtreecommitdiffstats
path: root/src/cmdline.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-12-13 21:57:44 +0100
committerMax Kellermann <max@duempel.org>2011-12-13 21:57:44 +0100
commitaa4f45b9a56779355f15f867dce9ab0759cb5f7a (patch)
treee0793dfab38b5540a02c8a8e3d4f2612fe2c3faa /src/cmdline.c
parent006b8fa3f07e948cbd277e91546dd815769d7a5e (diff)
parent96ad5b84446be0bf603895adaf0ec2e97bee11aa (diff)
downloadmpd-aa4f45b9a56779355f15f867dce9ab0759cb5f7a.tar.gz
mpd-aa4f45b9a56779355f15f867dce9ab0759cb5f7a.tar.xz
mpd-aa4f45b9a56779355f15f867dce9ab0759cb5f7a.zip
Merge branch 'v0.16.x'
Conflicts: NEWS configure.ac
Diffstat (limited to 'src/cmdline.c')
-rw-r--r--src/cmdline.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/cmdline.c b/src/cmdline.c
index 45e361e71..8ab317730 100644
--- a/src/cmdline.c
+++ b/src/cmdline.c
@@ -194,8 +194,6 @@ parse_cmdline(int argc, char **argv, struct options *options,
if(g_file_test(system_path,
G_FILE_TEST_IS_REGULAR)) {
ret = config_read_file(system_path,error_r);
- g_free(system_path);
- g_free(&system_config_dirs);
break;
}
++i;;