diff options
| author | Panu Matilainen <pmatilai@redhat.com> | 2010-10-26 23:28:39 +0300 |
|---|---|---|
| committer | Panu Matilainen <pmatilai@redhat.com> | 2010-10-26 23:28:39 +0300 |
| commit | b2a688ee00922811b6e77852bd43b7d0f5b0e0c0 (patch) | |
| tree | b033a50e97496725a5023a5342fd1c0acabc6ca4 /build | |
| parent | 5e13a1234ef363733744cbed58d44a6b97b2201f (diff) | |
| download | rpm-b2a688ee00922811b6e77852bd43b7d0f5b0e0c0.tar.gz rpm-b2a688ee00922811b6e77852bd43b7d0f5b0e0c0.tar.bz2 rpm-b2a688ee00922811b6e77852bd43b7d0f5b0e0c0.zip | |
Make rpmfcExec() internal
- Nobody in their right mind is likely to be calling what's really
an internal helper function in the build code. Simply missed in
the first round of librpmbuild API butchery.
- This eliminates the last remaining exposure of StringBuf in the API
Diffstat (limited to 'build')
| -rw-r--r-- | build/rpmbuild_internal.h | 11 | ||||
| -rw-r--r-- | build/rpmfc.h | 11 |
2 files changed, 11 insertions, 11 deletions
diff --git a/build/rpmbuild_internal.h b/build/rpmbuild_internal.h index e7b5bf436..ebc0c09e5 100644 --- a/build/rpmbuild_internal.h +++ b/build/rpmbuild_internal.h @@ -377,6 +377,17 @@ rpmRC processBinaryFiles(rpmSpec spec, rpmBuildPkgFlags pkgFlags, RPM_GNUC_INTERNAL rpmRC rpmfcGenerateDepends(const rpmSpec spec, Package pkg); +/** \ingroup rpmfc + * Return helper output. + * @param av helper argv (with possible macros) + * @param sb_stdin helper input + * @retval *sb_stdoutp helper output + * @param failnonzero IS non-zero helper exit status a failure? + */ +RPM_GNUC_INTERNAL +int rpmfcExec(ARGV_const_t av, StringBuf sb_stdin, StringBuf * sb_stdoutp, + int failnonzero); + /** \ingroup rpmbuild * Post-build processing for policies in binary package(s). * @param spec spec file control structure diff --git a/build/rpmfc.h b/build/rpmfc.h index d9e75bd78..ab3256812 100644 --- a/build/rpmfc.h +++ b/build/rpmfc.h @@ -8,7 +8,6 @@ #include <rpm/rpmtypes.h> #include <rpm/argv.h> /* for ARGV_t */ -#include <rpm/rpmstring.h> /* for StringBuf */ #include <rpm/rpmspec.h> /* for Package */ #ifdef __cplusplus @@ -45,16 +44,6 @@ typedef rpmFlags FCOLOR_t; typedef const struct rpmfcTokens_s * rpmfcToken; /** \ingroup rpmfc - * Return helper output. - * @param av helper argv (with possible macros) - * @param sb_stdin helper input - * @retval *sb_stdoutp helper output - * @param failnonzero IS non-zero helper exit status a failure? - */ -int rpmfcExec(ARGV_const_t av, StringBuf sb_stdin, StringBuf * sb_stdoutp, - int failnonzero); - -/** \ingroup rpmfc * Print results of file classification. * @todo Remove debugging routine. * @param msg message prefix (NULL for none) |