summaryrefslogtreecommitdiff
path: root/build/pack.c
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2001-10-15 17:53:34 +0000
committerjbj <devnull@localhost>2001-10-15 17:53:34 +0000
commit72471f2e54686202a9862a3fd3bd6d0135d81d2a (patch)
tree3625a73d9ef73f4f29df80fe98fb6133041cb4bc /build/pack.c
parent3f462f318fd2f602fddb1a95e5d652e67aafa49e (diff)
downloadrpm-72471f2e54686202a9862a3fd3bd6d0135d81d2a.tar.gz
rpm-72471f2e54686202a9862a3fd3bd6d0135d81d2a.tar.bz2
rpm-72471f2e54686202a9862a3fd3bd6d0135d81d2a.zip
Explicit branchstate annotations.
CVS patchset: 5113 CVS date: 2001/10/15 17:53:34
Diffstat (limited to 'build/pack.c')
-rw-r--r--build/pack.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/build/pack.c b/build/pack.c
index 962b48085..856051c01 100644
--- a/build/pack.c
+++ b/build/pack.c
@@ -333,10 +333,12 @@ int readRPM(const char *fileName, Spec *specp, struct rpmlead *lead,
/*@notreached@*/ break;
}
+ /*@-branchstate@*/
if (specp)
*specp = spec;
else
spec = freeSpec(spec);
+ /*@=branchstate@*/
if (csa != NULL)
csa->cpioFdIn = fdi;
@@ -408,6 +410,7 @@ int writeRPM(Header *hdrp, const char *fileName, int type,
providePackageNVR(h);
/* Save payload information */
+ /*@-branchstate@*/
switch(type) {
case RPMLEAD_SOURCE:
rpmio_flags = rpmExpand("%{?_source_payload:%{_source_payload}}", NULL);
@@ -416,6 +419,7 @@ int writeRPM(Header *hdrp, const char *fileName, int type,
rpmio_flags = rpmExpand("%{?_binary_payload:%{_binary_payload}}", NULL);
break;
}
+ /*@=branchstate@*/
if (!(rpmio_flags && *rpmio_flags)) {
rpmio_flags = _free(rpmio_flags);
rpmio_flags = xstrdup("w9.gzdio");