folkslinux
/
rpm
mirror of https://github.com/rpm-software-management/rpm.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use correct type in rpmSanitizeDSFlags and rpmParseDSFlags

This commit is contained in:
Michael Schroeder 2014-09-12 14:50:59 +02:00
parent e3e5ba7603
commit 4e8218f066
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/parseReqs.c
View File

@ -143,7 +143,7 @@ rpmRC parseRCPOT(rpmSpec spec, Package pkg, const char *field, rpmTagVal tagN,
/* Check for possible logical operator */
if (ve > v) {
rpmFlags sense = rpmParseDSFlags(v, ve - v);
rpmsenseFlags sense = rpmParseDSFlags(v, ve - v);
if (sense) {
Flags |= sense;

4
lib/rpmds.c
View File

@ -1244,7 +1244,7 @@ rpmstrPool rpmdsPool(rpmds ds)
return (ds != NULL) ? ds->pool : NULL;
}
rpmFlags rpmSanitizeDSFlags(rpmTagVal tagN, rpmFlags Flags)
rpmsenseFlags rpmSanitizeDSFlags(rpmTagVal tagN, rpmsenseFlags Flags)
{
rpmsenseFlags extra = RPMSENSE_ANY;
switch (tagN) {
@ -1285,7 +1285,7 @@ const char * token;
{ NULL, 0 },
};
rpmFlags rpmParseDSFlags(const char *str, size_t len)
rpmsenseFlags rpmParseDSFlags(const char *str, size_t len)
{
const struct ReqComp *rc;
for (rc = ReqComparisons; rc->token != NULL; rc++)

4
lib/rpmds.h
View File

@ -93,7 +93,7 @@ typedef rpmFlags rpmsenseFlags;
* @param flags flags
* @return flags filtered to allowed bits
*/
rpmFlags rpmSanitizeDSFlags(rpmTagVal tagN, rpmFlags Flags);
rpmsenseFlags rpmSanitizeDSFlags(rpmTagVal tagN, rpmsenseFlags Flags);
/** \ingroup rpmds
* Convert a string to the sense flags
@ -101,7 +101,7 @@ rpmFlags rpmSanitizeDSFlags(rpmTagVal tagN, rpmFlags Flags);
* @param len length of the string
* @return flags, zero for unknwon relations
*/
rpmFlags rpmParseDSFlags(const char *str, size_t len);
rpmsenseFlags rpmParseDSFlags(const char *str, size_t len);
/** \ingroup rpmds
* Reference a dependency set instance.