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

Eliminate headerVerifyInfo() from API + ABI 

Another internal piece that should've never been exported in the first
place, lets do so now since we're breaking the ABI anyway...
Oh and lets make headerVerifyRegion() properly internal while
we're at it.
This commit is contained in:
Panu Matilainen 2016-10-24 12:06:47 +03:00
parent cc57e916dd
commit e6f0fb7b28
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/header.h
View File

@ -62,17 +62,6 @@ Header headerLink(Header h);
*/ */
unsigned int headerSizeof(Header h, int magicp); unsigned int headerSizeof(Header h, int magicp);
/** \ingroup header
* Perform simple sanity and range checks on header tag(s).
* @param il no. of tags in header
* @param dl no. of bytes in header data.
* @param pev 1st element in tag array, big-endian
* @param iv failing (or last) tag element, host-endian
* @param negate negative offset expected?
* @return -1 on success, otherwise failing tag element index
*/
int headerVerifyInfo(int il, int dl, const void * pev, void * iv, int negate);
/** \ingroup header /** \ingroup header
* Convert header to on-disk representation. * Convert header to on-disk representation.
* @deprecated Use headerExport() instead * @deprecated Use headerExport() instead

13
lib/header_internal.h
View File

@ -64,11 +64,24 @@ static inline void ei2h(entryInfo pe, entryInfo info)
info->count = ntohl(pe->count); info->count = ntohl(pe->count);
} }
RPM_GNUC_INTERNAL
rpmRC headerVerifyRegion(rpmTagVal regionTag, rpmRC headerVerifyRegion(rpmTagVal regionTag,
int il, int dl, entryInfo pe, unsigned char *dataStart, int il, int dl, entryInfo pe, unsigned char *dataStart,
int exact_size, int *ril, int *rdl, char **buf); int exact_size, int *ril, int *rdl, char **buf);
/** \ingroup header
* Perform simple sanity and range checks on header tag(s).
* @param il no. of tags in header
* @param dl no. of bytes in header data.
* @param pev 1st element in tag array, big-endian
* @param iv failing (or last) tag element, host-endian
* @param negate negative offset expected?
* @return -1 on success, otherwise failing tag element index
*/
RPM_GNUC_INTERNAL
int headerVerifyInfo(int il, int dl, const void * pev, void * iv, int negate);
/** \ingroup header /** \ingroup header
* Set header instance (rpmdb record number) * Set header instance (rpmdb record number)