Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=e5ac342b40e7979a16e4088eb050b1cb2851c757
commit e5ac342b40e7979a16e4088eb050b1cb2851c757 Author: Michel Hermier <[email protected]> Date: Mon May 5 22:00:13 2014 +0200 libpacman: Make Package::description a getter. diff --git a/lib/libpacman/db/localdb.cpp b/lib/libpacman/db/localdb.cpp index 7ef6c3b..74de205 100644 --- a/lib/libpacman/db/localdb.cpp +++ b/lib/libpacman/db/localdb.cpp @@ -387,7 +387,7 @@ int LocalDatabase::write(Package *info, unsigned int inforeq) } _pacman_localdb_write_string("NAME", info->name(), fp); _pacman_localdb_write_string("VERSION", info->version(), fp); - if(info->desc[0]) { + if(info->description()[0]) { _pacman_localdb_write_stringlist("DESC", info->desc_localized, fp); } _pacman_localdb_write_stringlist("GROUPS", info->groups(), fp); diff --git a/lib/libpacman/db/localdb_files.cpp b/lib/libpacman/db/localdb_files.cpp index 47691d8..f5797c4 100644 --- a/lib/libpacman/db/localdb_files.cpp +++ b/lib/libpacman/db/localdb_files.cpp @@ -74,14 +74,14 @@ int _pacman_localdb_desc_fread(Package *info, FILE *fp) f_strtrim(line); if(!strcmp(line, "%DESC%")) { _pacman_db_read_lines(&info->desc_localized, line, sline, fp); - STRNCPY(info->desc, (char*)info->desc_localized->data, sizeof(info->desc)); + STRNCPY(info->m_description, (char*)info->desc_localized->data, sizeof(info->m_description)); for (i = info->desc_localized; i; i = i->next) { if (!strncmp(i->data, handle->language, strlen(handle->language)) && *((char*)i->data+strlen(handle->language)) == ' ') { - STRNCPY(info->desc, (char*)i->data+strlen(handle->language)+1, sizeof(info->desc)); + STRNCPY(info->m_description, (char*)i->data+strlen(handle->language)+1, sizeof(info->m_description)); } } - f_strtrim(info->desc); + f_strtrim(info->m_description); } else if(!strcmp(line, "%GROUPS%")) { _pacman_db_read_lines(&info->m_groups, line, sline, fp); } else if(!strcmp(line, "%URL%")) { diff --git a/lib/libpacman/package.cpp b/lib/libpacman/package.cpp index 390a645..81c5a83 100644 --- a/lib/libpacman/package.cpp +++ b/lib/libpacman/package.cpp @@ -74,7 +74,7 @@ Package::Package(const libpacman::Package &other) flags = other.flags; 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(m_description, other.m_description, PKG_DESC_LEN); STRNCPY(m_url, other.m_url, PKG_URL_LEN); STRNCPY(builddate, other.builddate, PKG_DATE_LEN); STRNCPY(buildtype, other.buildtype, PKG_DATE_LEN); @@ -467,7 +467,7 @@ int _pacman_packagestrmatcher_match(const void *ptr, const void *matcher_data) { if(((flags & PM_PACKAGE_FLAG_NAME) && f_str_match(pkg->name(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_VERSION) && f_str_match(pkg->version(), strmatcher)) || - ((flags & PM_PACKAGE_FLAG_DESCRIPTION) && f_str_match(pkg->desc, strmatcher)) || + ((flags & PM_PACKAGE_FLAG_DESCRIPTION) && f_str_match(pkg->description(), strmatcher)) || ((flags & PM_PACKAGE_FLAG_BUILDDATE) && f_str_match(pkg->builddate, strmatcher)) || ((flags & PM_PACKAGE_FLAG_BUILDTYPE) && f_str_match(pkg->buildtype, strmatcher)) || ((flags & PM_PACKAGE_FLAG_INSTALLDATE) && f_str_match(pkg->installdate, strmatcher)) || diff --git a/lib/libpacman/package.h b/lib/libpacman/package.h index cf4c388..95531c8 100644 --- a/lib/libpacman/package.h +++ b/lib/libpacman/package.h @@ -124,7 +124,7 @@ public: unsigned int flags; char m_name[PKG_NAME_LEN]; char m_version[PKG_VERSION_LEN]; - char desc[PKG_DESC_LEN]; + char m_description[PKG_DESC_LEN]; char m_url[PKG_URL_LEN]; char builddate[PKG_DATE_LEN]; char buildtype[PKG_TYPE_LEN]; diff --git a/lib/libpacman/package/fpmpackage.cpp b/lib/libpacman/package/fpmpackage.cpp index 42c6149..f85648c 100644 --- a/lib/libpacman/package/fpmpackage.cpp +++ b/lib/libpacman/package/fpmpackage.cpp @@ -83,9 +83,9 @@ int _pacman_pkginfo_fread(FILE *descfile, Package *info, int output) } else if(!strcmp(key, "PKGDESC")) { 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)); + STRNCPY(info->m_description, ptr, sizeof(info->m_description)); } else if (!strncmp(ptr, handle->language, strlen(handle->language))) { - STRNCPY(info->desc, ptr+strlen(handle->language)+1, sizeof(info->desc)); + STRNCPY(info->m_description, ptr+strlen(handle->language)+1, sizeof(info->m_description)); } } else if(!strcmp(key, "GROUP")) { info->m_groups = f_stringlist_append(info->m_groups, ptr); diff --git a/lib/libpacman/package_properties.h b/lib/libpacman/package_properties.h index 5633d3e..8e6dba8 100644 --- a/lib/libpacman/package_properties.h +++ b/lib/libpacman/package_properties.h @@ -22,6 +22,7 @@ LIBPACMAN_PACKAGE_PROPERTY(FStringList *, backup, BACKUP ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, conflicts, CONFLICTS ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, depends, DEPENDS ) +LIBPACMAN_PACKAGE_PROPERTY(const char *, description, DESCRIPTION) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, files, FILES ) LIBPACMAN_PACKAGE_PROPERTY(unsigned char, force, FORCE ) LIBPACMAN_PACKAGE_PROPERTY(FStringList *, groups, GROUPS ) diff --git a/lib/libpacman/pacman.cpp b/lib/libpacman/pacman.cpp index 17d775a..fe5c31d 100644 --- a/lib/libpacman/pacman.cpp +++ b/lib/libpacman/pacman.cpp @@ -853,7 +853,7 @@ void *pacman_pkg_getinfo(pmpkg_t *_pkg, unsigned char parm) switch(parm) { case PM_PKG_NAME: data = pkg->name(); break; case PM_PKG_VERSION: data = pkg->version(); break; - case PM_PKG_DESC: data = pkg->desc; break; + case PM_PKG_DESC: data = pkg->description(); break; case PM_PKG_GROUPS: data = pkg->groups(); break; case PM_PKG_URL: data = pkg->url(); break; case PM_PKG_ARCH: data = pkg->arch; break; _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
