moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-11-12 04:15:06 -05:00
Code Issues Releases Wiki Activity

Avoid a memmove by advancing value pointer

Browse Source 
In packages, our description file contains:
key = value is here
type entries, and we passed "key " and " value is here" to our strtrim
function, causing us to always memmove the value portion to remove the
space. Since this is a throwaway buffer, do the advancing on our own before
trimming to save the need to shift memory around; "value is here" will now
be passed and strtrim will be responsible for trailing whitespace.

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2011-02-08 21:16:36 -06:00
parent 56721c12ce
commit 06cbb516c3
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libalpm/be_package.c
View File

@ -175,6 +175,7 @@ static int parse_descfile(struct archive *a, pmpkg_t *newpkg)
newpkg->name ? newpkg->name : "error", linenum); newpkg->name ? newpkg->name : "error", linenum);
} else { } else {
key = _alpm_strtrim(key); key = _alpm_strtrim(key);
while(*ptr == ' ') ptr++;
ptr = _alpm_strtrim(ptr); ptr = _alpm_strtrim(ptr);
if(strcmp(key, "pkgname") == 0) { if(strcmp(key, "pkgname") == 0) {
STRDUP(newpkg->name, ptr, RET_ERR(PM_ERR_MEMORY, -1)); STRDUP(newpkg->name, ptr, RET_ERR(PM_ERR_MEMORY, -1));