From: Max Kellermann <max@duempel.org>
Date: Thu, 25 Dec 2008 13:09:24 +0000 (+0100)
Subject: conf: use GLib's string stripping functions
X-Git-Tag: release-0.13~37
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e131d3f01174e54402c8872d83d9edbc246b38d1;p=ncmpc.git

conf: use GLib's string stripping functions
---

diff --git a/src/conf.c b/src/conf.c
index 27b2024..0d80ce1 100644
--- a/src/conf.c
+++ b/src/conf.c
@@ -515,30 +515,10 @@ read_rc_file(char *filename)
 		}
 
 	while (fgets(line, sizeof(line), file) != NULL) {
-		int i;
-		int len;
+		char *p = g_strchug(line);
 
-		i = strlen(line);
-
-		/* remove trailing whitespace */
-		i--;
-		while (i >= 0 && g_ascii_isspace(line[i])) {
-			line[i] = '\0';
-			i--;
-		}
-
-		len = i + 1;
-		if (len > 0) {
-			i = 0;
-			/* skip whitespace */
-			while (i < len && g_ascii_isspace(line[i]))
-				i++;
-
-			/* continue if this line is not a comment */
-			if (line[i] != COMMENT_TOKEN) {
-				parse_line(line + i);
-			}
-		}
+		if (*p != 0 && *p != COMMENT_TOKEN)
+			parse_line(g_strchomp(p));
 	}
 
 	fclose(file);