rpmcli.h   rpmcli.h 
skipping to change at line 126 skipping to change at line 126
QUERY_DEPS = (1 << 17), /*!< verify: from --nodeps */ QUERY_DEPS = (1 << 17), /*!< verify: from --nodeps */
QUERY_SCRIPT = (1 << 18), /*!< verify: from --noscripts */ QUERY_SCRIPT = (1 << 18), /*!< verify: from --noscripts */
QUERY_DIGEST = (1 << 19), /*!< verify: from --nodigest */ QUERY_DIGEST = (1 << 19), /*!< verify: from --nodigest */
QUERY_SIGNATURE = (1 << 20), /*!< verify: from --nosignature */ QUERY_SIGNATURE = (1 << 20), /*!< verify: from --nosignature */
QUERY_PATCHES = (1 << 21), /*!< verify: from --nopatches */ QUERY_PATCHES = (1 << 21), /*!< verify: from --nopatches */
QUERY_HDRCHK = (1 << 22), /*!< verify: from --nohdrchk */ QUERY_HDRCHK = (1 << 22), /*!< verify: from --nohdrchk */
QUERY_FOR_LIST = (1 << 23), /*!< query: from --list */ QUERY_FOR_LIST = (1 << 23), /*!< query: from --list */
QUERY_FOR_STATE = (1 << 24), /*!< query: from --state */ QUERY_FOR_STATE = (1 << 24), /*!< query: from --state */
QUERY_FOR_DOCS = (1 << 25), /*!< query: from --docfiles */ QUERY_FOR_DOCS = (1 << 25), /*!< query: from --docfiles */
QUERY_FOR_CONFIG = (1 << 26), /*!< query: from --configfiles */ QUERY_FOR_CONFIG = (1 << 26), /*!< query: from --configfiles */
QUERY_FOR_DUMPFILES = (1 << 27) /*!< query: from --dump */ QUERY_FOR_DUMPFILES = (1 << 27), /*!< query: from --dump */
QUERY_FOR_LICENSE = (1 << 28) /*!< query: from --licensefiles */
}; };
typedef rpmFlags rpmQueryFlags; typedef rpmFlags rpmQueryFlags;
#define _QUERY_FOR_BITS \ #define _QUERY_FOR_BITS \
(QUERY_FOR_LIST|QUERY_FOR_STATE|QUERY_FOR_DOCS|QUERY_FOR_CONFIG|\ (QUERY_FOR_LIST|QUERY_FOR_STATE|QUERY_FOR_DOCS|QUERY_FOR_CONFIG|\
QUERY_FOR_DUMPFILES) QUERY_FOR_LICENSE|QUERY_FOR_DUMPFILES)
/** \ingroup rpmcli /** \ingroup rpmcli
* Bit(s) from common command line options. * Bit(s) from common command line options.
*/ */
extern rpmQueryFlags rpmcliQueryFlags; extern rpmQueryFlags rpmcliQueryFlags;
/** \ingroup rpmcli /** \ingroup rpmcli
*/ */
typedef struct rpmQVKArguments_s * QVA_t; typedef struct rpmQVKArguments_s * QVA_t;
 End of changes. 2 change blocks. 
2 lines changed or deleted 3 lines changed or added


 rpmds.h   rpmds.h 
skipping to change at line 101 skipping to change at line 101
* @return new dependency set reference * @return new dependency set reference
*/ */
rpmds rpmdsLink(rpmds ds); rpmds rpmdsLink(rpmds ds);
/** \ingroup rpmds /** \ingroup rpmds
* Destroy a dependency set. * Destroy a dependency set.
* @param ds dependency set * @param ds dependency set
* @return NULL always * @return NULL always
*/ */
rpmds rpmdsFree(rpmds ds); rpmds rpmdsFree(rpmds ds);
/** \ingroup rpmds /** \ingroup rpmds
* Create and load a dependency set. * Create and load a dependency set.
* @param h header * @param h header
* @param tagN type of dependency * @param tagN type of dependency
* @param flags unused * @param flags unused
* @return new dependency set * @return new dependency set
*/ */
rpmds rpmdsNew(Header h, rpmTagVal tagN, int flags); rpmds rpmdsNew(Header h, rpmTagVal tagN, int flags);
/** \ingroup rpmds /** \ingroup rpmds
 End of changes. 1 change blocks. 
0 lines changed or deleted 1 lines changed or added


 rpmfi.h   rpmfi.h 
skipping to change at line 49 skipping to change at line 49
RPMFILE_STATE_NORMAL = 0, RPMFILE_STATE_NORMAL = 0,
RPMFILE_STATE_REPLACED = 1, RPMFILE_STATE_REPLACED = 1,
RPMFILE_STATE_NOTINSTALLED = 2, RPMFILE_STATE_NOTINSTALLED = 2,
RPMFILE_STATE_NETSHARED = 3, RPMFILE_STATE_NETSHARED = 3,
RPMFILE_STATE_WRONGCOLOR = 4 RPMFILE_STATE_WRONGCOLOR = 4
} rpmfileState; } rpmfileState;
#define RPMFILE_IS_INSTALLED(_x) ((_x) == RPMFILE_STATE_NORMAL || (_x) == R PMFILE_STATE_NETSHARED) #define RPMFILE_IS_INSTALLED(_x) ((_x) == RPMFILE_STATE_NORMAL || (_x) == R PMFILE_STATE_NETSHARED)
/** /**
* File Attributes. * Exported File Attributes (ie RPMTAG_FILEFLAGS)
*/ */
enum rpmfileAttrs_e { enum rpmfileAttrs_e {
RPMFILE_NONE = 0, RPMFILE_NONE = 0,
RPMFILE_CONFIG = (1 << 0), /*!< from %%config */ RPMFILE_CONFIG = (1 << 0), /*!< from %%config */
RPMFILE_DOC = (1 << 1), /*!< from %%doc */ RPMFILE_DOC = (1 << 1), /*!< from %%doc */
RPMFILE_ICON = (1 << 2), /*!< from %%donotuse. */ RPMFILE_ICON = (1 << 2), /*!< from %%donotuse. */
RPMFILE_MISSINGOK = (1 << 3), /*!< from %%config(missingok) */ RPMFILE_MISSINGOK = (1 << 3), /*!< from %%config(missingok) */
RPMFILE_NOREPLACE = (1 << 4), /*!< from %%config(noreplace) */ RPMFILE_NOREPLACE = (1 << 4), /*!< from %%config(noreplace) */
RPMFILE_SPECFILE = (1 << 5), /*!< @todo (unnecessary) marks 1st f ile in srpm. */ RPMFILE_SPECFILE = (1 << 5), /*!< @todo (unnecessary) marks 1st f ile in srpm. */
RPMFILE_GHOST = (1 << 6), /*!< from %%ghost */ RPMFILE_GHOST = (1 << 6), /*!< from %%ghost */
RPMFILE_LICENSE = (1 << 7), /*!< from %%license */ RPMFILE_LICENSE = (1 << 7), /*!< from %%license */
RPMFILE_README = (1 << 8), /*!< from %%readme */ RPMFILE_README = (1 << 8), /*!< from %%readme */
RPMFILE_EXCLUDE = (1 << 9), /*!< from %%exclude, internal */ /* bits 9-10 unused */
RPMFILE_UNPATCHED = (1 << 10), /*!< placeholder (SuSE) */
RPMFILE_PUBKEY = (1 << 11), /*!< from %%pubkey */ RPMFILE_PUBKEY = (1 << 11), /*!< from %%pubkey */
}; };
typedef rpmFlags rpmfileAttrs; typedef rpmFlags rpmfileAttrs;
#define RPMFILE_ALL ~(RPMFILE_NONE) #define RPMFILE_ALL ~(RPMFILE_NONE)
/** \ingroup rpmfi /** \ingroup rpmfi
* File disposition(s) during package install/erase transaction. * File disposition(s) during package install/erase transaction.
*/ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 2 lines changed or added


 rpmfileutil.h   rpmfileutil.h 
skipping to change at line 112 skipping to change at line 112
const char * urlfile); const char * urlfile);
/** \ingroup rpmfileutil /** \ingroup rpmfileutil
* Return (malloc'ed) expanded, canonicalized, file path. * Return (malloc'ed) expanded, canonicalized, file path.
* @param path macro(s) to expand (NULL terminates list) * @param path macro(s) to expand (NULL terminates list)
* @return canonicalized path (malloc'ed) * @return canonicalized path (malloc'ed)
*/ */
char * rpmGetPath (const char * path, ...) RPM_GNUC_NULL_TERMINATED; char * rpmGetPath (const char * path, ...) RPM_GNUC_NULL_TERMINATED;
/** \ingroup rpmfileutil /** \ingroup rpmfileutil
* Check whether pattern contains any glob metacharacters.
* @param pattern glob pattern
* @param quote allow backslash quoting of metacharacters?
* @return 1 if pattern contains globs, 0 otherwise
*/
int rpmIsGlob(const char * pattern, int quote);
/** \ingroup rpmfileutil
* Return URL path(s) from a (URL prefixed) pattern glob. * Return URL path(s) from a (URL prefixed) pattern glob.
* @param patterns glob pattern * @param patterns glob pattern
* @retval *argcPtr no. of paths * @retval *argcPtr no. of paths
* @retval *argvPtr ARGV_t array of paths * @retval *argvPtr ARGV_t array of paths
* @return 0 on success * @return 0 on success
*/ */
int rpmGlob(const char * patterns, int * argcPtr, ARGV_t * argvPtr); int rpmGlob(const char * patterns, int * argcPtr, ARGV_t * argvPtr);
/** \ingroup rpmfileutil /** \ingroup rpmfileutil
* Escape isspace(3) characters in string. * Escape isspace(3) characters in string.
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 rpmlib.h   rpmlib.h 
skipping to change at line 72 skipping to change at line 72
/** \ingroup rpmrc /** \ingroup rpmrc
* Return current arch name and/or number. * Return current arch name and/or number.
* @todo Generalize to extract arch component from target_platform macro. * @todo Generalize to extract arch component from target_platform macro.
* @retval name address of arch name (or NULL) * @retval name address of arch name (or NULL)
* @retval num address of arch number (or NULL) * @retval num address of arch number (or NULL)
*/ */
void rpmGetArchInfo( const char ** name, void rpmGetArchInfo( const char ** name,
int * num); int * num);
/** \ingroup rpmrc /** \ingroup rpmrc
* Return color for an arch
* @param arch name of an architecture
* @return color color of arch, -1 if the arch couldn't be determine
d
*/
int rpmGetArchColor(const char *arch);
/** \ingroup rpmrc
* Return current os name and/or number. * Return current os name and/or number.
* @todo Generalize to extract os component from target_platform macro. * @todo Generalize to extract os component from target_platform macro.
* @retval name address of os name (or NULL) * @retval name address of os name (or NULL)
* @retval num address of os number (or NULL) * @retval num address of os number (or NULL)
*/ */
void rpmGetOsInfo( const char ** name, void rpmGetOsInfo( const char ** name,
int * num); int * num);
/** \ingroup rpmrc /** \ingroup rpmrc
* Return arch/os score of a name. * Return arch/os score of a name.
 End of changes. 1 change blocks. 
0 lines changed or deleted 8 lines changed or added


 rpmstring.h   rpmstring.h 
skipping to change at line 100 skipping to change at line 100
/** /**
* Convert hex to binary nibble. * Convert hex to binary nibble.
* @param c hex character * @param c hex character
* @return binary nibble * @return binary nibble
*/ */
RPM_GNUC_CONST RPM_GNUC_CONST
static inline unsigned char rnibble(char c) static inline unsigned char rnibble(char c)
{ {
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
return (c - '0'); return (c - '0');
if (c >= 'A' && c <= 'F')
return (c - 'A') + 10;
if (c >= 'a' && c <= 'f') if (c >= 'a' && c <= 'f')
return (c - 'a') + 10; return (c - 'a') + 10;
if (c >= 'A' && c <= 'F')
return (c - 'A') + 10;
return 0; return 0;
} }
/** /**
* Test for string equality * Test for string equality
* @param s1 string 1 * @param s1 string 1
* @param s2 string 2 * @param s2 string 2
* @return 0 if strings differ, 1 if equal * @return 0 if strings differ, 1 if equal
*/ */
static inline int rstreq(const char *s1, const char *s2) static inline int rstreq(const char *s1, const char *s2)
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 rpmtd.h   rpmtd.h 
skipping to change at line 359 skipping to change at line 359
/* \ingroup rpmtd /* \ingroup rpmtd
* Perform deep copy of container. * Perform deep copy of container.
* Create a modifiable copy of tag data container (on string arrays each * Create a modifiable copy of tag data container (on string arrays each
* string is separately allocated) * string is separately allocated)
* @todo Only string arrays types are supported currently * @todo Only string arrays types are supported currently
* @param td Container to copy * @param td Container to copy
* @return New container or NULL on error * @return New container or NULL on error
*/ */
rpmtd rpmtdDup(rpmtd td); rpmtd rpmtdDup(rpmtd td);
/* \ingroup rpmtd
* Push string array container contents to a string pool, return string ids
.
* @param td Tag data container
* @param pool String pool
* @return Array of string id's (malloced)
*/
rpmsid * rpmtdToPool(rpmtd td, rpmstrPool pool);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
#endif /* _RPMTD_H */ #endif /* _RPMTD_H */
 End of changes. 1 change blocks. 
0 lines changed or deleted 9 lines changed or added


 rpmtypes.h   rpmtypes.h 
skipping to change at line 80 skipping to change at line 80
typedef struct rpmps_s * rpmps; typedef struct rpmps_s * rpmps;
typedef struct rpmdbIndexIterator_s * rpmdbIndexIterator; typedef struct rpmdbIndexIterator_s * rpmdbIndexIterator;
typedef const void * fnpyKey; typedef const void * fnpyKey;
typedef void * rpmCallbackData; typedef void * rpmCallbackData;
/** @} */ /** @} */
typedef struct rpmPubkey_s * rpmPubkey; typedef struct rpmPubkey_s * rpmPubkey;
typedef struct rpmKeyring_s * rpmKeyring; typedef struct rpmKeyring_s * rpmKeyring;
typedef uint32_t rpmsid;
typedef struct rpmstrPool_s * rpmstrPool;
typedef struct rpmPlugins_s * rpmPlugins; typedef struct rpmPlugins_s * rpmPlugins;
typedef struct rpmgi_s * rpmgi; typedef struct rpmgi_s * rpmgi;
typedef struct rpmSpec_s * rpmSpec; typedef struct rpmSpec_s * rpmSpec;
typedef struct rpmRelocation_s rpmRelocation; typedef struct rpmRelocation_s rpmRelocation;
/** \ingroup rpmtypes /** \ingroup rpmtypes
* RPM IO file descriptor type * RPM IO file descriptor type
 End of changes. 1 change blocks. 
0 lines changed or deleted 3 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/