summaryrefslogtreecommitdiff
path: root/rpmio/macro.c
diff options
context:
space:
mode:
authorjbj <devnull@localhost>2003-05-08 20:39:29 +0000
committerjbj <devnull@localhost>2003-05-08 20:39:29 +0000
commit9c5529608e389271b80469054bfe80737521590a (patch)
treeb1df8b79cd3fdbb7f10d3b48ee25fddb66072fe3 /rpmio/macro.c
parentdb7ab2f447ee6097b2e98a526f6383a5ca388718 (diff)
downloadlibrpm-tizen-9c5529608e389271b80469054bfe80737521590a.tar.gz
librpm-tizen-9c5529608e389271b80469054bfe80737521590a.tar.bz2
librpm-tizen-9c5529608e389271b80469054bfe80737521590a.zip
- don't use error string after gzclose (Dmitry V. Levin).
Spliddles for rpmio, drill h_errno all the way through. CVS patchset: 6826 CVS date: 2003/05/08 20:39:29
Diffstat (limited to 'rpmio/macro.c')
-rw-r--r--rpmio/macro.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/rpmio/macro.c b/rpmio/macro.c
index cfa7c3351..27f6415e6 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -114,7 +114,7 @@ int print_expand_trace = 0;
/* forward ref */
static int expandMacro(MacroBuf mb)
/*@globals rpmGlobalMacroContext,
- print_macro_trace, print_expand_trace, fileSystem @*/
+ print_macro_trace, print_expand_trace, h_errno, fileSystem @*/
/*@modifies mb, rpmGlobalMacroContext,
print_macro_trace, print_expand_trace, fileSystem @*/;
@@ -492,7 +492,7 @@ printExpansion(MacroBuf mb, const char * t, const char * te)
*/
static int
expandT(MacroBuf mb, const char * f, size_t flen)
- /*@globals rpmGlobalMacroContext, fileSystem@*/
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem@*/
/*@modifies mb, rpmGlobalMacroContext, fileSystem @*/
{
char *sbuf;
@@ -546,7 +546,7 @@ expandS(MacroBuf mb, char * tbuf, size_t tbuflen)
/*@-boundswrite@*/
static int
expandU(MacroBuf mb, char * u, size_t ulen)
- /*@globals rpmGlobalMacroContext, fileSystem@*/
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem@*/
/*@modifies mb, *u, rpmGlobalMacroContext, fileSystem @*/
{
const char *s = mb->s;
@@ -585,7 +585,7 @@ expandU(MacroBuf mb, char * u, size_t ulen)
/*@-boundswrite@*/
static int
doShellEscape(MacroBuf mb, const char * cmd, size_t clen)
- /*@globals rpmGlobalMacroContext, fileSystem @*/
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/
/*@modifies mb, rpmGlobalMacroContext, fileSystem @*/
{
char pcmd[BUFSIZ];
@@ -624,7 +624,7 @@ doShellEscape(MacroBuf mb, const char * cmd, size_t clen)
*/
/*@dependent@*/ static const char *
doDefine(MacroBuf mb, /*@returned@*/ const char * se, int level, int expandbody)
- /*@globals rpmGlobalMacroContext @*/
+ /*@globals rpmGlobalMacroContext, h_errno @*/
/*@modifies mb, rpmGlobalMacroContext @*/
{
const char *s = se;
@@ -1032,7 +1032,7 @@ grabArgs(MacroBuf mb, const MacroEntry me, /*@returned@*/ const char * se, char
*/
static void
doOutput(MacroBuf mb, int waserror, const char * msg, size_t msglen)
- /*@globals rpmGlobalMacroContext, fileSystem @*/
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem @*/
/*@modifies mb, rpmGlobalMacroContext, fileSystem @*/
{
char buf[BUFSIZ];
@@ -1058,7 +1058,7 @@ doOutput(MacroBuf mb, int waserror, const char * msg, size_t msglen)
static void
doFoo(MacroBuf mb, int negate, const char * f, size_t fn,
/*@null@*/ const char * g, size_t gn)
- /*@globals rpmGlobalMacroContext, fileSystem, internalState @*/
+ /*@globals rpmGlobalMacroContext, h_errno, fileSystem, internalState @*/
/*@modifies mb, rpmGlobalMacroContext, fileSystem, internalState @*/
{
char buf[BUFSIZ], *b = NULL, *be;
@@ -1160,7 +1160,7 @@ doFoo(MacroBuf mb, int negate, const char * f, size_t fn,
static int
expandMacro(MacroBuf mb)
/*@globals rpmGlobalMacroContext,
- print_macro_trace, print_expand_trace, fileSystem @*/
+ print_macro_trace, print_expand_trace, h_errno, fileSystem @*/
/*@modifies mb, rpmGlobalMacroContext,
print_macro_trace, print_expand_trace, fileSystem @*/
{