moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-12-23 00:08:50 -05:00
Code Issues Releases Wiki Activity

Remove redundant _alpm_strtrim() in be_local.c

Browse Source 
When reading the "desc" file in _alpm_local_db_read(), some
strings are trimmed and checked for length > 0 before their
use/duplication subsequently. They are then trimmed again
when there is no need to.

The following code snippet should illustrate it clearly:

while(fgets(line, sizeof(line), fp) &&
	strlen(_alpm_strtrim(line))) {

	char *linedup;
	STRDUP(linedup, _alpm_strtrim(line), goto error);
	info->groups = alpm_list_add(info->groups, linedup);
}

This patch removes the redundant _alpm_strtrim() calls in
_alpm_local_db_read() such as the one inside the STRDUP shown
above.

Signed-off-by: Pang Yan Han <pangyanhan@gmail.com>
Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Pang Yan Han 2011-02-05 11:48:54 +08:00 committed by Dan McGee
parent 30bb969ace
commit 3865352d23
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/libalpm/be_local.c
View File

@ -551,7 +551,7 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
} else if(strcmp(line, "%GROUPS%") == 0) { } else if(strcmp(line, "%GROUPS%") == 0) {
while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
char *linedup; char *linedup;
STRDUP(linedup, _alpm_strtrim(line), goto error); STRDUP(linedup, line, goto error);
info->groups = alpm_list_add(info->groups, linedup); info->groups = alpm_list_add(info->groups, linedup);
} }
} else if(strcmp(line, "%URL%") == 0) { } else if(strcmp(line, "%URL%") == 0) {
@ -562,7 +562,7 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
} else if(strcmp(line, "%LICENSE%") == 0) { } else if(strcmp(line, "%LICENSE%") == 0) {
while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
char *linedup; char *linedup;
STRDUP(linedup, _alpm_strtrim(line), goto error); STRDUP(linedup, line, goto error);
info->licenses = alpm_list_add(info->licenses, linedup); info->licenses = alpm_list_add(info->licenses, linedup);
} }
} else if(strcmp(line, "%ARCH%") == 0) { } else if(strcmp(line, "%ARCH%") == 0) {
@ -607,30 +607,30 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
} else if(strcmp(line, "%REPLACES%") == 0) { } else if(strcmp(line, "%REPLACES%") == 0) {
while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
char *linedup; char *linedup;
STRDUP(linedup, _alpm_strtrim(line), goto error); STRDUP(linedup, line, goto error);
info->replaces = alpm_list_add(info->replaces, linedup); info->replaces = alpm_list_add(info->replaces, linedup);
} }
} else if(strcmp(line, "%DEPENDS%") == 0) { } else if(strcmp(line, "%DEPENDS%") == 0) {
while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
pmdepend_t *dep = _alpm_splitdep(_alpm_strtrim(line)); pmdepend_t *dep = _alpm_splitdep(line);
info->depends = alpm_list_add(info->depends, dep); info->depends = alpm_list_add(info->depends, dep);
} }
} else if(strcmp(line, "%OPTDEPENDS%") == 0) { } else if(strcmp(line, "%OPTDEPENDS%") == 0) {
while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
char *linedup; char *linedup;
STRDUP(linedup, _alpm_strtrim(line), goto error); STRDUP(linedup, line, goto error);
info->optdepends = alpm_list_add(info->optdepends, linedup); info->optdepends = alpm_list_add(info->optdepends, linedup);
} }
} else if(strcmp(line, "%CONFLICTS%") == 0) { } else if(strcmp(line, "%CONFLICTS%") == 0) {
while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
char *linedup; char *linedup;
STRDUP(linedup, _alpm_strtrim(line), goto error); STRDUP(linedup, line, goto error);
info->conflicts = alpm_list_add(info->conflicts, linedup); info->conflicts = alpm_list_add(info->conflicts, linedup);
} }
} else if(strcmp(line, "%PROVIDES%") == 0) { } else if(strcmp(line, "%PROVIDES%") == 0) {
while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
char *linedup; char *linedup;
STRDUP(linedup, _alpm_strtrim(line), goto error); STRDUP(linedup, line, goto error);
info->provides = alpm_list_add(info->provides, linedup); info->provides = alpm_list_add(info->provides, linedup);
} }
} }
@ -651,13 +651,13 @@ int _alpm_local_db_read(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
if(strcmp(line, "%FILES%") == 0) { if(strcmp(line, "%FILES%") == 0) {
while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
char *linedup; char *linedup;
STRDUP(linedup, _alpm_strtrim(line), goto error); STRDUP(linedup, line, goto error);
info->files = alpm_list_add(info->files, linedup); info->files = alpm_list_add(info->files, linedup);
} }
} else if(strcmp(line, "%BACKUP%") == 0) { } else if(strcmp(line, "%BACKUP%") == 0) {
while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) { while(fgets(line, sizeof(line), fp) && strlen(_alpm_strtrim(line))) {
char *linedup; char *linedup;
STRDUP(linedup, _alpm_strtrim(line), goto error); STRDUP(linedup, line, goto error);
info->backup = alpm_list_add(info->backup, linedup); info->backup = alpm_list_add(info->backup, linedup);
} }
} }