diff options
| author | jbj <devnull@localhost> | 2001-10-15 17:53:34 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2001-10-15 17:53:34 +0000 |
| commit | 72471f2e54686202a9862a3fd3bd6d0135d81d2a (patch) | |
| tree | 3625a73d9ef73f4f29df80fe98fb6133041cb4bc /build/build.c | |
| parent | 3f462f318fd2f602fddb1a95e5d652e67aafa49e (diff) | |
| download | rpm-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/build.c')
| -rw-r--r-- | build/build.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/build/build.c b/build/build.c index 60fc36677..18ac635dc 100644 --- a/build/build.c +++ b/build/build.c @@ -77,42 +77,44 @@ int doScript(Spec spec, int what, const char *name, StringBuf sb, int test) int status; int rc; + /*@-branchstate@*/ switch (what) { - case RPMBUILD_PREP: + case RPMBUILD_PREP: name = "%prep"; sb = spec->prep; mTemplate = "%{__spec_prep_template}"; mPost = "%{__spec_prep_post}"; break; - case RPMBUILD_BUILD: + case RPMBUILD_BUILD: name = "%build"; sb = spec->build; mTemplate = "%{__spec_build_template}"; mPost = "%{__spec_build_post}"; break; - case RPMBUILD_INSTALL: + case RPMBUILD_INSTALL: name = "%install"; sb = spec->install; mTemplate = "%{__spec_install_template}"; mPost = "%{__spec_install_post}"; break; - case RPMBUILD_CLEAN: + case RPMBUILD_CLEAN: name = "%clean"; sb = spec->clean; mTemplate = "%{__spec_clean_template}"; mPost = "%{__spec_clean_post}"; break; - case RPMBUILD_RMBUILD: + case RPMBUILD_RMBUILD: name = "--clean"; mTemplate = "%{__spec_clean_template}"; mPost = "%{__spec_clean_post}"; break; - case RPMBUILD_STRINGBUF: - default: + case RPMBUILD_STRINGBUF: + default: mTemplate = "%{___build_template}"; mPost = "%{___build_post}"; break; } + /*@=branchstate@*/ if ((what != RPMBUILD_RMBUILD) && sb == NULL) { rc = 0; @@ -136,17 +138,22 @@ int doScript(Spec spec, int what, const char *name, StringBuf sb, int test) } #endif + /*@-branchstate@*/ if (fdGetFp(fd) == NULL) xfd = Fdopen(fd, "w.fpio"); else xfd = fd; + /*@=branchstate@*/ + if ((fp = fdGetFp(xfd)) == NULL) { rc = RPMERR_SCRIPT; goto exit; } (void) urlPath(rootURL, &rootDir); + /*@-branchstate@*/ if (*rootDir == '\0') rootDir = "/"; + /*@=branchstate@*/ (void) urlPath(scriptName, &buildScript); |