summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--rpmio/digest.c9
-rw-r--r--rpmio/macro.c19
-rw-r--r--rpmio/rpmdav.c3
-rw-r--r--rpmio/rpmio.c6
-rw-r--r--rpmio/rpmlog.c1
-rw-r--r--rpmio/rpmmacro.h12
-rw-r--r--rpmio/rpmrpc.c6
-rw-r--r--rpmio/rpmsw.c4
-rw-r--r--rpmio/url.c2
9 files changed, 9 insertions, 53 deletions
diff --git a/rpmio/digest.c b/rpmio/digest.c
index 169273892..dc39aa140 100644
--- a/rpmio/digest.c
+++ b/rpmio/digest.c
@@ -22,12 +22,9 @@ struct DIGEST_CTX_s {
uint32_t paramlen; /*!< No. bytes of digest parameters. */
uint32_t digestlen; /*!< No. bytes of digest. */
void * param; /*!< Digest parameters. */
- int (*Reset) (void * param)
- /*@modifies param @*/; /*!< Digest initialize. */
- int (*Update) (void * param, const byte * data, size_t size)
- /*@modifies param @*/; /*!< Digest transform. */
- int (*Digest) (void * param, byte * digest)
- /*@modifies param, digest @*/; /*!< Digest finish. */
+ int (*Reset) (void * param); /*!< Digest initialize. */
+ int (*Update) (void * param, const byte * data, size_t size); /*!< Digest transform. */
+ int (*Digest) (void * param, byte * digest); /*!< Digest finish. */
};
DIGEST_CTX
diff --git a/rpmio/macro.c b/rpmio/macro.c
index dc2907c88..00b194ecd 100644
--- a/rpmio/macro.c
+++ b/rpmio/macro.c
@@ -53,8 +53,6 @@ typedef FILE * FD_t;
#include "debug.h"
-/*@access FD_t@*/ /* XXX compared with NULL */
-
static struct MacroContext_s rpmGlobalMacroContext_s;
MacroContext rpmGlobalMacroContext = &rpmGlobalMacroContext_s;
@@ -90,11 +88,7 @@ int print_expand_trace = _PRINT_EXPAND_TRACE;
#define MACRO_CHUNK_SIZE 16
/* forward ref */
-static int expandMacro(MacroBuf mb)
- /*@globals rpmGlobalMacroContext,
- print_macro_trace, print_expand_trace, h_errno, fileSystem @*/
- /*@modifies mb, rpmGlobalMacroContext,
- print_macro_trace, print_expand_trace, fileSystem @*/;
+static int expandMacro(MacroBuf mb);
/**
* Wrapper to free(3), hides const compilation noise, permit NULL, return NULL.
@@ -416,30 +410,25 @@ printExpansion(MacroBuf mb, const char * t, const char * te)
}
#define SKIPBLANK(_s, _c) \
- /*@-globs@*/ /* FIX: __ctype_b */ \
while (((_c) = *(_s)) && isblank(_c)) \
(_s)++; \
#define SKIPNONBLANK(_s, _c) \
- /*@-globs@*/ /* FIX: __ctype_b */ \
while (((_c) = *(_s)) && !(isblank(_c) || iseol(_c))) \
(_s)++; \
#define COPYNAME(_ne, _s, _c) \
{ SKIPBLANK(_s,_c); \
- /*@-boundswrite@*/ \
while(((_c) = *(_s)) && (xisalnum(_c) || (_c) == '_')) \
*(_ne)++ = *(_s)++; \
*(_ne) = '\0'; \
- /*@=boundswrite@*/ \
}
#define COPYOPTS(_oe, _s, _c) \
- { /*@-boundswrite@*/ \
+ { \
while(((_c) = *(_s)) && (_c) != ')') \
*(_oe)++ = *(_s)++; \
*(_oe) = '\0'; \
- /*@=boundswrite@*/ \
}
/**
@@ -1105,10 +1094,6 @@ doFoo(MacroBuf mb, int negate, const char * f, size_t fn,
*/
static int
expandMacro(MacroBuf mb)
- /*@globals rpmGlobalMacroContext,
- print_macro_trace, print_expand_trace, h_errno, fileSystem @*/
- /*@modifies mb, rpmGlobalMacroContext,
- print_macro_trace, print_expand_trace, fileSystem @*/
{
MacroEntry *mep;
MacroEntry me;
diff --git a/rpmio/rpmdav.c b/rpmio/rpmdav.c
index ab6313718..470b4720c 100644
--- a/rpmio/rpmdav.c
+++ b/rpmio/rpmdav.c
@@ -285,7 +285,6 @@ static int davInit(const char * url, urlinfo * uret)
urlinfo u = NULL;
int rc = 0;
-/*@-globs@*/ /* FIX: h_errno annoyance. */
if (urlSplit(url, &u))
return -1; /* XXX error returns needed. */
@@ -438,7 +437,6 @@ static void *fetch_create_context(const char *uri)
struct fetch_context_s * ctx;
urlinfo u;
-/*@-globs@*/ /* FIX: h_errno annoyance. */
if (urlSplit(uri, &u))
return NULL;
@@ -1034,7 +1032,6 @@ fprintf(stderr, "*** davSeek(%p,pos,%d)\n", cookie, whence);
return -1;
}
-/*@-mustmod@*/ /* HACK: fd->req is modified. */
int davClose(void * cookie)
{
FD_t fd = cookie;
diff --git a/rpmio/rpmio.c b/rpmio/rpmio.c
index 7e57487c3..ac7704f1c 100644
--- a/rpmio/rpmio.c
+++ b/rpmio/rpmio.c
@@ -71,8 +71,6 @@ static int inet_aton(const char *cp, struct in_addr *inp)
#include "debug.h"
-/*@access FILE @*/ /* XXX to permit comparison/conversion with void *. */
-
#define FDNREFS(fd) (fd ? ((FD_t)fd)->nrefs : -9)
#define FDTO(fd) (fd ? ((FD_t)fd)->rd_timeoutsecs : -99)
#define FDCPIOPOS(fd) (fd ? ((FD_t)fd)->fd_cpioPos : -99)
@@ -726,7 +724,6 @@ static int mygethostbyname(const char * host,
}
#endif
-/*@-compdef@*/ /* FIX: address->s_addr undefined. */
static int getHostAddress(const char * host, struct in_addr * address)
{
#if 0 /* XXX workaround nss_foo module hand-off using valgrind. */
@@ -1866,7 +1863,6 @@ static inline int ufdSeek(void * cookie, _libio_pos_t pos, int whence)
return fdSeek(cookie, pos, whence);
}
-/*@-usereleased@*/ /* LCL: fd handling is tricky here. */
int ufdClose( void * cookie)
{
FD_t fd = c2f(cookie);
@@ -1970,7 +1966,6 @@ int ufdClose( void * cookie)
return fdClose(fd);
}
-/*@-nullstate@*/ /* FIX: u->{ctrl,data}->url undef after XurlLink. */
FD_t ftpOpen(const char *url, int flags,
mode_t mode, urlinfo *uret)
{
@@ -2423,7 +2418,6 @@ static int bzdFlush(FD_t fd)
}
/* =============================================================== */
-/*@-mustmod@*/ /* LCL: *buf is modified */
static ssize_t bzdRead(void * cookie, char * buf, size_t count)
{
FD_t fd = c2f(cookie);
diff --git a/rpmio/rpmlog.c b/rpmio/rpmlog.c
index 0a8d9fd40..ed2091ee9 100644
--- a/rpmio/rpmlog.c
+++ b/rpmio/rpmlog.c
@@ -120,7 +120,6 @@ FILE * rpmlogSetFile(FILE * fp)
return ofp;
}
-/*@-readonlytrans@*/ /* FIX: double indirection. */
static char *rpmlogMsgPrefix[] = {
N_("fatal error: "),/*!< RPMLOG_EMERG */
N_("fatal error: "),/*!< RPMLOG_ALERT */
diff --git a/rpmio/rpmmacro.h b/rpmio/rpmmacro.h
index d6d8312df..cfa0994ba 100644
--- a/rpmio/rpmmacro.h
+++ b/rpmio/rpmmacro.h
@@ -17,7 +17,7 @@ typedef struct MacroEntry_s {
/*! The structure used to store the set of macros in a context. */
typedef struct MacroContext_s {
-/*@owned@*/MacroEntry *macroTable; /*!< Macro entry table for context. */
+ MacroEntry *macroTable; /*!< Macro entry table for context. */
int macrosAllocated;/*!< No. of allocated macros. */
int firstFree; /*!< No. of macros. */
} * MacroContext;
@@ -124,20 +124,14 @@ void rpmLoadMacros (MacroContext mc, int level);
* @param mc (unused)
* @param fn macro file name
*/
-int rpmLoadMacroFile(MacroContext mc, const char * fn)
- /*@globals rpmGlobalMacroContext,
- h_errno, fileSystem, internalState @*/
-;
+int rpmLoadMacroFile(MacroContext mc, const char * fn);
/**
* Initialize macro context from set of macrofile(s).
* @param mc macro context
* @param macrofiles colon separated list of macro files (NULL does nothing)
*/
-void rpmInitMacros (MacroContext mc, const char * macrofiles)
- /*@globals rpmGlobalMacroContext, rpmCLIMacroContext,
- h_errno, fileSystem, internalState @*/
-;
+void rpmInitMacros (MacroContext mc, const char * macrofiles);
/**
* Destroy macro context.
diff --git a/rpmio/rpmrpc.c b/rpmio/rpmrpc.c
index dc9102693..3900e0619 100644
--- a/rpmio/rpmrpc.c
+++ b/rpmio/rpmrpc.c
@@ -820,10 +820,6 @@ static char * ftpBuf = NULL;
static int ftpNLST(const char * url, ftpSysCall_t ftpSysCall,
struct stat * st,
char * rlbuf, size_t rlbufsiz)
- /*@globals ftpBufAlloced, ftpBuf,
- h_errno, fileSystem, internalState @*/
- /*@modifies *st, *rlbuf, ftpBufAlloced, ftpBuf,
- fileSystem, internalState @*/
{
FD_t fd;
const char * path;
@@ -1344,7 +1340,7 @@ int Glob_pattern_p (const char * pattern, int quote)
return (0);
}
-int Glob_error(/*@unused@*/const char * epath, int eerrno)
+int Glob_error(const char * epath, int eerrno)
{
return 1;
}
diff --git a/rpmio/rpmsw.c b/rpmio/rpmsw.c
index b4005c57b..d530d5427 100644
--- a/rpmio/rpmsw.c
+++ b/rpmio/rpmsw.c
@@ -154,10 +154,6 @@ static rpmtime_t rpmswCalibrate(void)
#endif
rpmtime_t rpmswInit(void)
- /*@globals rpmsw_cycles, rpmsw_initialized, rpmsw_overhead,
- rpmsw_type @*/
- /*@modifies rpmsw_cycles, rpmsw_initialized, rpmsw_overhead,
- rpmsw_type @*/
{
struct rpmsw_s begin, end;
#if defined(HP_TIMING_NOW)
diff --git a/rpmio/url.c b/rpmio/url.c
index 43fc46dcf..6a647a7c0 100644
--- a/rpmio/url.c
+++ b/rpmio/url.c
@@ -12,8 +12,6 @@
#include "debug.h"
-/*@access FD_t@*/ /* XXX compared with NULL */
-
#ifndef IPPORT_FTP
#define IPPORT_FTP 21
#endif
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 21:55:19 +0000