From 3a765b98b6f63aeef2606322b0771679984446d7 Mon Sep 17 00:00:00 2001 From: Panu Matilainen Date: Tue, 24 Aug 2010 13:23:51 +0300 Subject: [PATCH] Eliminate now unnecessary buildio.h - readRPM() is not used or needed by anything, shred it - make writeRPM() static inside the only place needing it: pack.c - move struct cpioSourceArchive_s inside pack.c --- build/Makefile.am | 2 +- build/buildio.h | 60 --------------------------------------- build/files.c | 1 - build/pack.c | 84 +++++-------------------------------------------------- build/spec.c | 2 +- 5 files changed, 9 insertions(+), 140 deletions(-) delete mode 100644 build/buildio.h diff --git a/build/Makefile.am b/build/Makefile.am index f5ed2f6..1d1c841 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -9,7 +9,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/misc usrlibdir = $(libdir) usrlib_LTLIBRARIES = librpmbuild.la librpmbuild_la_SOURCES = \ - build.c buildio.h expression.c files.c misc.c names.c pack.c \ + build.c expression.c files.c misc.c names.c pack.c \ parseBuildInstallClean.c parseChangelog.c parseDescription.c \ parseFiles.c parsePreamble.c parsePrep.c parseReqs.c parseScript.c \ parseSpec.c poptBT.c reqprov.c rpmfc.c spec.c fts.h fts.c diff --git a/build/buildio.h b/build/buildio.h deleted file mode 100644 index 8c13982..0000000 --- a/build/buildio.h +++ /dev/null @@ -1,60 +0,0 @@ -#ifndef _H_BUILDIO_ -#define _H_BUILDIO_ - -/** \ingroup rpmbuild - * \file build/buildio.h - * Routines to read and write packages. - * @deprecated this information will move elsewhere eventually. - * @todo Eliminate, merge into rpmlib. - */ - -#include - -#ifdef __cplusplus -extern "C" { -#endif - -/** - */ -typedef struct cpioSourceArchive_s { - rpm_loff_t cpioArchiveSize; - FD_t cpioFdIn; - rpmfi cpioList; -} * CSA_t; - -/** - * Read rpm package components from file. - * @param fileName file name of package (or NULL to use stdin) - * @retval specp spec structure to carry package header (or NULL) - * @retval sigs package signature - * @param csa - * @return RPMRC_OK on success - */ -rpmRC readRPM(const char * fileName, - rpmSpec * specp, - Header * sigs, - CSA_t csa); - -/** - * Write rpm package to file. - * - * @warning The first argument (header) is now passed by reference in order to - * return a reloaded contiguous header to the caller. - * - * @retval *hdrp header to write (final header is returned). - * @retval *pkgidp header+payload MD5 of package (NULL to disable). - * @param fileName file name of package - * @param csa - * @retval cookie generated cookie (i.e build host/time) - * @return RPMRC_OK on success - */ -rpmRC writeRPM(Header * hdrp, unsigned char ** pkgidp, - const char * fileName, - CSA_t csa, - char ** cookie); - -#ifdef __cplusplus -} -#endif - -#endif /* _H_BUILDIO_ */ diff --git a/build/files.c b/build/files.c index ec2acc1..3f84bc9 100644 --- a/build/files.c +++ b/build/files.c @@ -26,7 +26,6 @@ #include "build/fts.h" #include "lib/cpio.h" #include "lib/rpmfi_internal.h" /* XXX fi->apath */ -#include "build/buildio.h" #include "debug.h" #include diff --git a/build/pack.c b/build/pack.c index e323f21..d7bd2b0 100644 --- a/build/pack.c +++ b/build/pack.c @@ -20,10 +20,15 @@ #include "lib/rpmte_internal.h" /* rpmfs */ #include "lib/signature.h" #include "lib/rpmlead.h" -#include "build/buildio.h" #include "debug.h" +typedef struct cpioSourceArchive_s { + rpm_loff_t cpioArchiveSize; + FD_t cpioFdIn; + rpmfi cpioList; +} * CSA_t; + /** * @todo Create transaction set *much* earlier. */ @@ -273,82 +278,7 @@ static rpmRC processScriptFiles(rpmSpec spec, Package pkg) return RPMRC_OK; } -rpmRC readRPM(const char *fileName, rpmSpec *specp, - Header *sigs, CSA_t csa) -{ - FD_t fdi; - rpmSpec spec; - rpmRC rc; - - fdi = (fileName != NULL) - ? Fopen(fileName, "r.ufdio") - : fdDup(STDIN_FILENO); - - if (fdi == NULL || Ferror(fdi)) { - rpmlog(RPMLOG_ERR, _("readRPM: open %s: %s\n"), - (fileName ? fileName : ""), - Fstrerror(fdi)); - if (fdi) (void) Fclose(fdi); - return RPMRC_FAIL; - } - - /* XXX FIXME: EPIPE on */ - if (Fseek(fdi, 0, SEEK_SET) == -1) { - rpmlog(RPMLOG_ERR, _("%s: Fseek failed: %s\n"), - (fileName ? fileName : ""), Fstrerror(fdi)); - return RPMRC_FAIL; - } - - /* Reallocate build data structures */ - spec = newSpec(); - spec->packages = newPackage(spec); - - /* XXX the header just allocated will be allocated again */ - spec->packages->header = headerFree(spec->packages->header); - - /* Read the rpm lead, signatures, and header */ - { rpmts ts = rpmtsCreate(); - - /* XXX W2DO? pass fileName? */ - rc = rpmReadPackageFile(ts, fdi, "readRPM", - &spec->packages->header); - - ts = rpmtsFree(ts); - - if (sigs) *sigs = NULL; /* XXX HACK */ - } - - switch (rc) { - case RPMRC_OK: - case RPMRC_NOKEY: - case RPMRC_NOTTRUSTED: - break; - case RPMRC_NOTFOUND: - rpmlog(RPMLOG_ERR, _("readRPM: %s is not an RPM package\n"), - (fileName ? fileName : "")); - return RPMRC_FAIL; - case RPMRC_FAIL: - default: - rpmlog(RPMLOG_ERR, _("readRPM: reading header from %s\n"), - (fileName ? fileName : "")); - return RPMRC_FAIL; - break; - } - - if (specp) - *specp = spec; - else - spec = freeSpec(spec); - - if (csa != NULL) - csa->cpioFdIn = fdi; - else - (void) Fclose(fdi); - - return RPMRC_OK; -} - -rpmRC writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName, +static rpmRC writeRPM(Header *hdrp, unsigned char ** pkgidp, const char *fileName, CSA_t csa, char **cookie) { FD_t fd = NULL; diff --git a/build/spec.c b/build/spec.c index 63e0828..77ccbc7 100644 --- a/build/spec.c +++ b/build/spec.c @@ -11,8 +11,8 @@ #include #include #include +#include -#include "build/buildio.h" #include "rpmio/rpmlua.h" #include "debug.h" -- 2.7.4