Git-Url:
http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=b26006d8442145afbd52d289f96d38819274195c
commit b26006d8442145afbd52d289f96d38819274195c
Author: Michel Hermier <herm...@frugalware.org>
Date: Mon Nov 18 08:56:05 2013 +0100
libpacman: Replace _pacman_stringlist_append to f_stringlist_append in
pkginfo.c.
diff --git a/lib/libpacman/package/pkginfo.c b/lib/libpacman/package/pkginfo.c
index e20bf2c..ad6af3d 100644
--- a/lib/libpacman/package/pkginfo.c
+++ b/lib/libpacman/package/pkginfo.c
@@ -80,18 +80,18 @@ int _pacman_pkginfo_fread(FILE *descfile, pmpkg_t *info,
int output)
} else if(!strcmp(key, "PKGVER")) {
STRNCPY(info->version, ptr, sizeof(info->version));
} else if(!strcmp(key, "PKGDESC")) {
- info->desc_localized =
_pacman_stringlist_append(info->desc_localized, ptr);
+ info->desc_localized =
f_stringlist_append(info->desc_localized, ptr);
if(_pacman_list_count(info->desc_localized) == 1) {
STRNCPY(info->desc, ptr, sizeof(info->desc));
} else if (!strncmp(ptr, handle->language, strlen(handle->language))) {
STRNCPY(info->desc, ptr+strlen(handle->language)+1, sizeof(info->desc));
}
} else if(!strcmp(key, "GROUP")) {
- info->groups =
_pacman_stringlist_append(info->groups, ptr);
+ info->groups =
f_stringlist_append(info->groups, ptr);
} else if(!strcmp(key, "URL")) {
STRNCPY(info->url, ptr, sizeof(info->url));
} else if(!strcmp(key, "LICENSE")) {
- info->license =
_pacman_stringlist_append(info->license, ptr);
+ info->license =
f_stringlist_append(info->license, ptr);
} else if(!strcmp(key, "BUILDDATE")) {
STRNCPY(info->builddate, ptr, sizeof(info->builddate));
} else if(!strcmp(key, "BUILDTYPE")) {
@@ -111,19 +111,19 @@ int _pacman_pkginfo_fread(FILE *descfile, pmpkg_t *info,
int output)
STRNCPY(tmp, ptr, sizeof(tmp));
info->usize = atol(tmp);
} else if(!strcmp(key, "DEPEND")) {
- info->depends =
_pacman_stringlist_append(info->depends, ptr);
+ info->depends =
f_stringlist_append(info->depends, ptr);
} else if(!strcmp(key, "REMOVE")) {
- info->removes =
_pacman_stringlist_append(info->removes, ptr);
+ info->removes =
f_stringlist_append(info->removes, ptr);
} else if(!strcmp(key, "CONFLICT")) {
- info->conflicts =
_pacman_stringlist_append(info->conflicts, ptr);
+ info->conflicts =
f_stringlist_append(info->conflicts, ptr);
} else if(!strcmp(key, "REPLACES")) {
- info->replaces =
_pacman_stringlist_append(info->replaces, ptr);
+ info->replaces =
f_stringlist_append(info->replaces, ptr);
} else if(!strcmp(key, "PROVIDES")) {
- info->provides =
_pacman_stringlist_append(info->provides, ptr);
+ info->provides =
f_stringlist_append(info->provides, ptr);
} else if(!strcmp(key, "BACKUP")) {
- info->backup =
_pacman_stringlist_append(info->backup, ptr);
+ info->backup =
f_stringlist_append(info->backup, ptr);
} else if(!strcmp(key, "TRIGGER")) {
- info->triggers =
_pacman_stringlist_append(info->triggers, ptr);
+ info->triggers =
f_stringlist_append(info->triggers, ptr);
} else {
_pacman_log(PM_LOG_DEBUG, _("%s: syntax error in description file line %d"),
info->name[0] != '\0' ? info->name : "error", linenum);
_______________________________________________
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git
