diff options
| author | jbj <devnull@localhost> | 2002-05-16 16:55:21 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2002-05-16 16:55:21 +0000 |
| commit | 076a6e29c5c8a35a5f78ae2a15339d030cfe2fdf (patch) | |
| tree | c79f91a35a1134d5cd67394c534e804405697d61 /build | |
| parent | bc9d22eeb9034966654091306e3e3fc9a9dd7c71 (diff) | |
| download | rpm-076a6e29c5c8a35a5f78ae2a15339d030cfe2fdf.tar.gz rpm-076a6e29c5c8a35a5f78ae2a15339d030cfe2fdf.tar.bz2 rpm-076a6e29c5c8a35a5f78ae2a15339d030cfe2fdf.zip | |
- opaque (well mostly) rpmTransactionSet using methods.
CVS patchset: 5437
CVS date: 2002/05/16 16:55:21
Diffstat (limited to 'build')
| -rw-r--r-- | build/Makefile.am | 3 | ||||
| -rw-r--r-- | build/myftw.c | 2 | ||||
| -rw-r--r-- | build/pack.c | 10 |
3 files changed, 9 insertions, 6 deletions
diff --git a/build/Makefile.am b/build/Makefile.am index 7ee98d00a..211fb8586 100644 --- a/build/Makefile.am +++ b/build/Makefile.am @@ -2,8 +2,7 @@ AUTOMAKE_OPTIONS = 1.4 foreign -INCLUDES = \ - -I$(top_srcdir) \ +INCLUDES = -I. \ -I$(top_srcdir)/lib \ -I$(top_srcdir)/rpmdb \ -I$(top_srcdir)/rpmio \ diff --git a/build/myftw.c b/build/myftw.c index 65199ac4f..7bb6f35a6 100644 --- a/build/myftw.c +++ b/build/myftw.c @@ -229,6 +229,7 @@ int myftw (const char *dir, if (flag == MYFTW_D) { +/*@-compdef@*/ /* FIX: *dirs not defined */ if (retval == 0) retval = myftw_dir (dirs, 0, descriptors, buf, len, func, fl); if (dirs[0] != NULL) @@ -241,6 +242,7 @@ int myftw (const char *dir, errno = save; /*@=mods@*/ } +/*@=compdef@*/ } return retval; diff --git a/build/pack.c b/build/pack.c index 5fbaf9ba6..9a711e395 100644 --- a/build/pack.c +++ b/build/pack.c @@ -11,7 +11,9 @@ #include "cpio.h" #include "fsm.h" #include "psm.h" + #include "rpmfi.h" +#include "rpmts.h" #include "buildio.h" @@ -54,7 +56,7 @@ static int cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa, fileSystem@*/ /*@modifies fdo, csa, rpmGlobalMacroContext, fileSystem @*/ { - rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL); + rpmTransactionSet ts = rpmtsCreate(); TFI_t fi = csa->cpioList; const char *failedFile = NULL; FD_t cfd; @@ -89,7 +91,7 @@ static int cpio_doio(FD_t fdo, /*@unused@*/ Header h, CSA_t csa, } failedFile = _free(failedFile); - ts = rpmtransFree(ts); + ts = rpmtsFree(ts); return rc; } @@ -319,7 +321,7 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead, spec->packages->header = headerFree(spec->packages->header, "spec->packages"); /* Read the rpm lead, signatures, and header */ - { rpmTransactionSet ts = rpmtransCreateSet(NULL, NULL); + { rpmTransactionSet ts = rpmtsCreate(); /* XXX W2DO? pass fileName? */ /*@-mustmod@*/ /* LCL: segfault */ @@ -327,7 +329,7 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead, &spec->packages->header); /*@=mustmod@*/ - ts = rpmtransFree(ts); + ts = rpmtsFree(ts); if (sigs) *sigs = NULL; /* XXX HACK */ } |