Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=0805873d1509793aad43e0fc735d432e7306fc5b
commit 0805873d1509793aad43e0fc735d432e7306fc5b Author: Michel Hermier <[email protected]> Date: Mon May 5 13:33:49 2014 +0200 libpacman: Make Package::url a getter. diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 698d765..a03ad47 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -391,7 +391,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) _pacman_localdb_write_stringlist("DESC", info->desc_localized, fp); } _pacman_localdb_write_stringlist("GROUPS", info->groups(), fp); - _pacman_localdb_write_string("URL", info->url, fp); + _pacman_localdb_write_string("URL", info->url(), fp); _pacman_localdb_write_stringlist("LICENSE", info->license, fp); _pacman_localdb_write_string("ARCH", info->arch, fp); _pacman_localdb_write_string("BUILDDATE", info->builddate, fp); diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index 8ddf4bf..30e0077 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -85,10 +85,10 @@ int _pacman_localdb_desc_fread(Package *info, FILE *fp) } else if(!strcmp(line, "%GROUPS%")) { _pacman_db_read_lines(&info->m_groups, line, sline, fp); } else if(!strcmp(line, "%URL%")) { - if(fgets(info->url, sizeof(info->url), fp) == NULL) { + if(fgets(info->m_url, sizeof(info->m_url), fp) == NULL) { goto error; } - f_strtrim(info->url); + f_strtrim(info->m_url); } else if(!strcmp(line, "%LICENSE%")) { _pacman_db_read_lines(&info->license, line, sline, fp); } else if(!strcmp(line, "%ARCH%")) { diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index b52f32c..ebb4409 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -75,7 +75,7 @@ Package::Package(const libpacman::Package &other) STRNCPY(m_name, other.m_name, PKG_NAME_LEN); STRNCPY(m_version, other.m_version, PKG_VERSION_LEN); STRNCPY(desc, other.desc, PKG_DESC_LEN); - STRNCPY(url, other.url, PKG_URL_LEN); + STRNCPY(m_url, other.m_url, PKG_URL_LEN); STRNCPY(builddate, other.builddate, PKG_DATE_LEN); STRNCPY(buildtype, other.buildtype, PKG_DATE_LEN); STRNCPY(installdate, other.installdate, PKG_DATE_LEN); diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index 6a74e09..1746365 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -125,7 +125,7 @@ public: char m_name[PKG_NAME_LEN]; char m_version[PKG_VERSION_LEN]; char desc[PKG_DESC_LEN]; - char url[PKG_URL_LEN]; + char m_url[PKG_URL_LEN]; char builddate[PKG_DATE_LEN]; char buildtype[PKG_TYPE_LEN]; char installdate[PKG_DATE_LEN]; diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 6bf0b61..56e5455 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -90,7 +90,7 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) } else if(!strcmp(key, "GROUP")) { info->m_groups = f_stringlist_append(info->m_groups, ptr); } else if(!strcmp(key, "URL")) { - STRNCPY(info->url, ptr, sizeof(info->url)); + STRNCPY(info->m_url, ptr, sizeof(info->m_url)); } else if(!strcmp(key, "LICENSE")) { info->license = f_stringlist_append(info->license, ptr); } else if(!strcmp(key, "BUILDDATE")) { diff --git a/lib/libpacman/package_properties.h b/lib/libpacman/package_properties.h index 9e492dc..521f458 100644 --- a/lib/libpacman/package_properties.h +++ b/lib/libpacman/package_properties.h @@ -30,5 +30,6 @@ LIBPACMAN_PACKAGE_PROPERTY(unsigned char, reason, REASON ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, replaces, REPLACES ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, requiredby, REQUIREDBY) LIBPACMAN_PACKAGE_PROPERTY(unsigned char, stick, STICKY ) +LIBPACMAN_PACKAGE_PROPERTY(const char *, url, URL ) LIBPACMAN_PACKAGE_PROPERTY(const char *, version, VERSION ) diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 7ce9bb2..23c08a9 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -855,7 +855,7 @@ void *pacman_pkg_getinfo(pmpkg_t *_pkg, unsigned char parm) case PM_PKG_VERSION: data = pkg->m_version; break; case PM_PKG_DESC: data = pkg->desc; break; case PM_PKG_GROUPS: data = pkg->m_groups; break; - case PM_PKG_URL: data = pkg->url; break; + case PM_PKG_URL: data = pkg->url(); break; case PM_PKG_ARCH: data = pkg->arch; break; case PM_PKG_BUILDDATE: data = pkg->builddate; break; case PM_PKG_BUILDTYPE: data = pkg->buildtype; break; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
