code cleanup
This commit is contained in:
parent
2cc81d9eea
commit
4b11a9b1ce
|
@ -176,7 +176,7 @@ pmpkg_t *db_scan(pmdb_t *db, char *target, unsigned int inforeq)
|
|||
char path[PATH_MAX];
|
||||
char name[(PKG_NAME_LEN-1)+1+(PKG_VERSION_LEN-1)+1];
|
||||
char *ptr = NULL;
|
||||
int ret, found = 0;
|
||||
int found = 0;
|
||||
pmpkg_t *pkg;
|
||||
|
||||
if(db == NULL) {
|
||||
|
@ -235,12 +235,11 @@ pmpkg_t *db_scan(pmdb_t *db, char *target, unsigned int inforeq)
|
|||
if(pkg == NULL) {
|
||||
return(NULL);
|
||||
}
|
||||
ret = db_read(db, ent->d_name, inforeq, pkg);
|
||||
if(ret == -1) {
|
||||
if(db_read(db, ent->d_name, inforeq, pkg) == -1) {
|
||||
FREEPKG(pkg);
|
||||
}
|
||||
|
||||
return(ret == 0 ? pkg : NULL);
|
||||
return(pkg);
|
||||
}
|
||||
|
||||
int db_read(pmdb_t *db, char *name, unsigned int inforeq, pmpkg_t *info)
|
||||
|
@ -290,8 +289,7 @@ int db_read(pmdb_t *db, char *name, unsigned int inforeq, pmpkg_t *info)
|
|||
_alpm_strtrim(info->desc);
|
||||
} else if(!strcmp(line, "%GROUPS%")) {
|
||||
while(fgets(line, 512, fp) && strlen(_alpm_strtrim(line))) {
|
||||
char *s = strdup(line);
|
||||
info->groups = pm_list_add(info->groups, s);
|
||||
info->groups = pm_list_add(info->groups, strdup(line));
|
||||
}
|
||||
} else if(!strcmp(line, "%URL%")) {
|
||||
if(fgets(info->url, sizeof(info->url), fp) == NULL) {
|
||||
|
|
Loading…
Reference in New Issue