From e28f321a486a310aeb3358ceff032793a88e5eb4 Mon Sep 17 00:00:00 2001 From: Dave Reisner Date: Fri, 23 Dec 2011 12:02:49 -0500 Subject: pactree: cleanup register_syncs - take advantage of the new strtrim return value - tighten scope on line pointer Signed-off-by: Dave Reisner --- src/util/pactree.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/util/pactree.c b/src/util/pactree.c index 77ee75e8..0adc2ea8 100644 --- a/src/util/pactree.c +++ b/src/util/pactree.c @@ -154,7 +154,7 @@ static size_t strtrim(char *str) static int register_syncs(void) { FILE *fp; - char *ptr, *section = NULL; + char *section = NULL; char line[LINE_MAX]; const alpm_siglevel_t level = ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; @@ -165,20 +165,23 @@ static int register_syncs(void) { } while(fgets(line, LINE_MAX, fp)) { - strtrim(line); + size_t linelen; + char *ptr; - if(line[0] == '#' || !strlen(line)) { + linelen = strtrim(line); + + if(line[0] == '#' || !linelen) { continue; } if((ptr = strchr(line, '#'))) { *ptr = '\0'; - strtrim(line); + linelen = strtrim(line); } - if(line[0] == '[' && line[strlen(line) - 1] == ']') { + if(line[0] == '[' && line[linelen - 1] == ']') { free(section); - section = strndup(&line[1], strlen(line) - 2); + section = strndup(&line[1], linelen - 2); if(section && strcmp(section, "options") != 0) { alpm_db_register_sync(handle, section, level); -- cgit v1.2.3-24-g4f1b