Merge remote branches 'jn/cosmetics', 'jn/doxygen' and 'jn/renames'

[ncmpc.git] / src / conf.c

diff --git a/src/conf.c b/src/conf.c
index 6c93e1e3a8692c53b0e17c7d13d4f7a5d816d81b..cce0b9408934025c097e139733f7362181e58389 100644 (file)
--- a/src/conf.c
+++ b/src/conf.c
@@ -1,21 +1,21 @@
 /* ncmpc (Ncurses MPD Client)
  * (c) 2004-2010 The Music Player Daemon Project
  * Project homepage: http://musicpd.org
- 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
-
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
-
+ *
  * You should have received a copy of the GNU General Public License along
  * with this program; if not, write to the Free Software Foundation, Inc.,
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
+ */
 
 #include "conf.h"
 #include "config.h"
@@ -377,10 +377,8 @@ parse_line(char *line)
        bool match_found;
 
        /* get the name part */
-       while (i < len && line[i] != '=' &&
-              !g_ascii_isspace(line[i])) {
+       while (i < len && line[i] != '=' && !g_ascii_isspace(line[i]))
                name[j++] = line[i++];
-       }
 
        name[j] = '\0';
 
@@ -535,8 +533,7 @@ parse_line(char *line)
                match_found = false;
 
        if (!match_found)
-               print_error(_("Unknown configuration parameter"),
-                           name);
+               print_error(_("Unknown configuration parameter"), name);
 
        return match_found;
 }
@@ -578,7 +575,11 @@ check_user_conf_dir(void)
                return 0;
        }
 
+#ifndef WIN32
        retval = mkdir(directory, 0755);
+#else
+       retval = mkdir(directory);
+#endif
        g_free(directory);
        return retval;
 }