moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-08-13 17:03:46 -04:00
Code Issues Releases Wiki Activity

pactree: cleanup register_syncs

Browse Source 
- take advantage of the new strtrim return value
- tighten scope on line pointer

Signed-off-by: Dave Reisner <dreisner@archlinux.org>
This commit is contained in:
Dave Reisner 2011-12-23 12:02:49 -05:00 committed by Dan McGee
parent bec0b0c823
commit e28f321a48
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/util/pactree.c
View File

@ -154,7 +154,7 @@ static size_t strtrim(char *str)
static int register_syncs(void) { static int register_syncs(void) {
FILE *fp; FILE *fp;
char *ptr, *section = NULL; char *section = NULL;
char line[LINE_MAX]; char line[LINE_MAX];
const alpm_siglevel_t level = ALPM_SIG_DATABASE | ALPM_SIG_DATABASE_OPTIONAL; 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)) { 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; continue;
} }
if((ptr = strchr(line, '#'))) { if((ptr = strchr(line, '#'))) {
*ptr = '\0'; *ptr = '\0';
strtrim(line); linelen = strtrim(line);
} }
if(line[0] == '[' && line[strlen(line) - 1] == ']') { if(line[0] == '[' && line[linelen - 1] == ']') {
free(section); free(section);
section = strndup(&line[1], strlen(line) - 2); section = strndup(&line[1], linelen - 2);
if(section && strcmp(section, "options") != 0) { if(section && strcmp(section, "options") != 0) {
alpm_db_register_sync(handle, section, level); alpm_db_register_sync(handle, section, level);