bryson/pacman
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rework for fixed length strings

Browse source
This commit is contained in:
Aurelien Foret 2005-03-19 18:15:31 +00:00
parent 2da0b2263e
commit bddea378b9
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/libalpm/alpm.c
View file

@ -292,18 +292,18 @@ void *alpm_pkg_getinfo(PM_PKG *pkg, unsigned char parm)
case PM_PKG_FILES: case PM_PKG_FILES:
case PM_PKG_BACKUP: case PM_PKG_BACKUP:
if(!(pkg->infolevel & INFRQ_FILES)) { if(!(pkg->infolevel & INFRQ_FILES)) {
char target[PKG_NAME_LEN+1+PKG_VERSION_LEN]; char target[PKG_NAME_LEN+PKG_VERSION_LEN];
snprintf(target, PKG_NAME_LEN+1+PKG_VERSION_LEN, "%s-%s", pkg->name, pkg->version); snprintf(target, PKG_NAME_LEN+PKG_VERSION_LEN, "%s-%s", pkg->name, pkg->version);
db_read(pkg->data, target, INFRQ_FILES, pkg); db_read(pkg->data, target, INFRQ_FILES, pkg);
} }
break; break;
case PM_PKG_SCRIPLET: case PM_PKG_SCRIPLET:
if(!(pkg->infolevel & INFRQ_SCRIPLET)) { if(!(pkg->infolevel & INFRQ_SCRIPLET)) {
char target[PKG_NAME_LEN+1+PKG_VERSION_LEN]; char target[PKG_NAME_LEN+PKG_VERSION_LEN];
snprintf(target, PKG_NAME_LEN+1+PKG_VERSION_LEN, "%s-%s", pkg->name, pkg->version); snprintf(target, PKG_NAME_LEN+PKG_VERSION_LEN, "%s-%s", pkg->name, pkg->version);
db_read(pkg->data, target, INFRQ_SCRIPLET, pkg); db_read(pkg->data, target, INFRQ_SCRIPLET, pkg);
} }
break; break;

3
lib/libalpm/util.c
View file

@ -144,13 +144,14 @@ char *_alpm_strtoupper(char *str)
char *_alpm_strtrim(char *str) char *_alpm_strtrim(char *str)
{ {
char *pch = str; char *pch = str;
while(isspace(*pch)) { while(isspace(*pch)) {
pch++; pch++;
} }
if(pch != str) { if(pch != str) {
memmove(str, pch, (strlen(pch) + 1)); memmove(str, pch, (strlen(pch) + 1));
} }
pch = (char*)(str + (strlen(str) - 1)); pch = (char*)(str + (strlen(str) - 1));
while(isspace(*pch)) { while(isspace(*pch)) {
pch--; pch--;