Imported Upstream version 4.14.1

[platform/upstream/rpm.git] / lib / header.h

diff --git a/lib/header.h b/lib/header.h
index ddaba4f..a616dee 100644 (file)
--- a/lib/header.h
+++ b/lib/header.h
@@ -55,18 +55,6 @@ Header headerFree( Header h);
 Header headerLink(Header h);
 
 /** \ingroup header
- * Sort tags in header.
- * @param h            header
- */
-void headerSort(Header h);
-
-/** \ingroup header
- * Restore tags in header to original ordering.
- * @param h            header
- */
-void headerUnsort(Header h);
-
-/** \ingroup header
  * Return size of on-disk header representation in bytes.
  * @param h            header
  * @param magicp       include size of 8 bytes for (magic, 0)?
@@ -75,17 +63,6 @@ void headerUnsort(Header h);
 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
  * Convert header to on-disk representation.
  * @deprecated         Use headerExport() instead
  * @param h            header (with pointers)
@@ -245,9 +222,9 @@ int headerPut(Header h, rpmtd td, headerPutFlags flags);
  * @return             1 on success, 0 on failure
  * 
  */
+int headerPutBin(Header h, rpmTagVal tag, const uint8_t *val, rpm_count_t size);
 int headerPutString(Header h, rpmTagVal tag, const char *val);
 int headerPutStringArray(Header h, rpmTagVal tag, const char **val, rpm_count_t size);
-int headerPutBin(Header h, rpmTagVal tag, const uint8_t *val, rpm_count_t size);
 int headerPutChar(Header h, rpmTagVal tag, const char *val, rpm_count_t size);
 int headerPutUint8(Header h, rpmTagVal tag, const uint8_t *val, rpm_count_t size);
 int headerPutUint16(Header h, rpmTagVal tag, const uint16_t *val, rpm_count_t size);
@@ -348,65 +325,6 @@ int headerNext(HeaderIterator hi, rpmtd td);
 rpmTagVal headerNextTag(HeaderIterator hi);
 
 /** \ingroup header
- * Return name, version, release strings from header.
- * @param h            header
- * @retval *np         name pointer (or NULL)
- * @retval *vp         version pointer (or NULL)
- * @retval *rp         release pointer (or NULL)
- * @return             0 always
- */
-RPM_GNUC_DEPRECATED
-int headerNVR(Header h,
-               const char ** np,
-               const char ** vp,
-               const char ** rp);
-
-/** \ingroup header
- * Return name, epoch, version, release, arch strings from header.
- * @param h            header
- * @retval *np         name pointer (or NULL)
- * @retval *ep         epoch pointer (or NULL)
- * @retval *vp         version pointer (or NULL)
- * @retval *rp         release pointer (or NULL)
- * @retval *ap         arch pointer (or NULL)
- * @return             0 always
- */
-RPM_GNUC_DEPRECATED
-int headerNEVRA(Header h,
-               const char ** np,
-               uint32_t ** ep,
-               const char ** vp,
-               const char ** rp,
-               const char ** ap);
-
-/** \ingroup header
- * Return (malloc'd) header name-version-release string.
- * @param h            header
- * @retval np          name tag value
- * @return             name-version-release string
- */
-RPM_GNUC_DEPRECATED
-char * headerGetNEVR(Header h, const char ** np );
-
-/** \ingroup header
- * Return (malloc'd) header name-version-release.arch string.
- * @param h            header
- * @retval np          name tag value
- * @return             name-version-release string
- */
-RPM_GNUC_DEPRECATED
-char * headerGetNEVRA(Header h, const char ** np );
-
-/* \ingroup header
- * Return (malloc'd) header (epoch:)version-release string.
- * @param h            header
- * @retval np          name tag value (or NULL)
- * @return             (epoch:)version-release string
- */
-RPM_GNUC_DEPRECATED
-char * headerGetEVR(Header h, const char **np);
-
-/** \ingroup header
  * Return any non-array tag from header, converted to string
  * @param h            header
  * @param tag          tag to retrieve
@@ -431,14 +349,6 @@ const char * headerGetString(Header h, rpmTagVal tag);
 uint64_t headerGetNumber(Header h, rpmTagVal tag);
 
 /** \ingroup header
- * Return header color.
- * @param h            header
- * @return             header color
- */
-RPM_GNUC_DEPRECATED
-rpm_color_t headerGetColor(Header h);
-
-/** \ingroup header
  * Check if header is a source or binary package header
  * @param h            header
  * @return             0 == binary, 1 == source