From f982bbaa79b0038bc1b4f9f9d419361a63c2b284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ralf=20Cors=C3=A9pius?= Date: Tue, 11 Sep 2007 16:48:54 +0200 Subject: Remove splint tags. --- rpmio/rpmurl.h | 62 +++++++++++++--------------------------------------------- 1 file changed, 14 insertions(+), 48 deletions(-) (limited to 'rpmio/rpmurl.h') diff --git a/rpmio/rpmurl.h b/rpmio/rpmurl.h index 4b02a21f4..d100636ea 100644 --- a/rpmio/rpmurl.h +++ b/rpmio/rpmurl.h @@ -23,28 +23,20 @@ typedef enum urltype_e { #define URLMAGIC 0xd00b1ed0 #define URLSANE(u) assert(u && u->magic == URLMAGIC) -typedef /*@abstract@*/ /*@refcounted@*/ struct urlinfo_s * urlinfo; +typedef struct urlinfo_s * urlinfo; /** * URL control structure. */ struct urlinfo_s { -/*@refs@*/ int nrefs; /*!< no. of references */ -/*@owned@*/ /*@relnull@*/ +int nrefs; /*!< no. of references */ const char * url; /*!< copy of original url */ -/*@owned@*/ /*@relnull@*/ const char * scheme; /*!< URI scheme. */ -/*@owned@*/ /*@null@*/ const char * user; /*!< URI user. */ -/*@owned@*/ /*@null@*/ const char * password; /*!< URI password. */ -/*@owned@*/ /*@relnull@*/ const char * host; /*!< URI host. */ -/*@owned@*/ /*@null@*/ const char * portstr; /*!< URI port string. */ -/*@owned@*/ /*@null@*/ const char * proxyu; /*!< FTP: proxy user */ -/*@owned@*/ /*@null@*/ const char * proxyh; /*!< FTP/HTTP: proxy host */ int proxyp; /*!< FTP/HTTP: proxy port */ int port; /*!< URI port. */ @@ -52,11 +44,8 @@ struct urlinfo_s { FD_t ctrl; /*!< control channel */ FD_t data; /*!< per-xfer data channel */ -/*@relnull@*/ void * capabilities; /*!< neon: ne_server_capabilities ptr */ -/*@relnull@*/ void * lockstore; /*!< neon: ne_lock_store ptr */ -/*@relnull@*/ void * sess; /*!< neon: ne_session ptr */ off_t current; /*!< neon: current body offset. */ off_t total; /*!< neon: total body length. */ @@ -71,7 +60,6 @@ typedef enum { #endif int bufAlloced; /*!< sizeof I/O buffer */ -/*@owned@*/ char * buf; /*!< I/O buffer */ int openError; /*!< Type of open failure */ int httpVersion; @@ -83,18 +71,13 @@ typedef enum { extern "C" { #endif -/*@unchecked@*/ extern int _url_count; /*!< No. of cached URL's. */ -/*@unchecked@*/ -/*@only@*/ /*@null@*/ extern urlinfo * _url_cache; /*!< URL cache. */ -/*@unchecked@*/ extern int _url_iobuf_size; /*!< Initial size of URL I/O buffer. */ #define RPMURL_IOBUF_SIZE 4096 -/*@unchecked@*/ extern int _url_debug; /*!< URL debugging? */ #define RPMURL_DEBUG_IO 0x40000000 #define RPMURL_DEBUG_REFS 0x20000000 @@ -105,10 +88,10 @@ extern int _url_debug; /*!< URL debugging? */ * @param msg debugging identifier (unused) * @return new instance */ -/*@unused@*/ urlinfo urlNew(const char * msg) /*@*/; +urlinfo urlNew(const char * msg) ; /** @todo Remove debugging entry from the ABI. */ -urlinfo XurlNew(const char * msg, const char * file, unsigned line) /*@*/; +urlinfo XurlNew(const char * msg, const char * file, unsigned line) ; #define urlNew(_msg) XurlNew(_msg, __FILE__, __LINE__) /** @@ -117,12 +100,10 @@ urlinfo XurlNew(const char * msg, const char * file, unsigned line) /*@*/; * @param msg debugging identifier (unused) * @return referenced instance */ -/*@unused@*/ urlinfo urlLink(urlinfo u, const char * msg) - /*@modifies u @*/; +urlinfo urlLink(urlinfo u, const char * msg); /** @todo Remove debugging entry from the ABI. */ -urlinfo XurlLink(urlinfo u, const char * msg, const char * file, unsigned line) - /*@modifies u @*/; +urlinfo XurlLink(urlinfo u, const char * msg, const char * file, unsigned line); #define urlLink(_u, _msg) XurlLink(_u, _msg, __FILE__, __LINE__) /** @@ -131,31 +112,24 @@ urlinfo XurlLink(urlinfo u, const char * msg, const char * file, unsigned line) * @param msg debugging identifier (unused) * @return dereferenced instance (NULL if freed) */ -/*@unused@*/ urlinfo urlFree( /*@killref@*/ urlinfo u, const char * msg) - /*@globals fileSystem, internalState @*/ - /*@modifies u, fileSystem, internalState @*/; +urlinfo urlFree( urlinfo u, const char * msg); /** @todo Remove debugging entry from the ABI. */ -urlinfo XurlFree( /*@killref@*/ urlinfo u, const char * msg, - const char * file, unsigned line) - /*@globals fileSystem, internalState @*/ - /*@modifies u, fileSystem, internalState @*/; +urlinfo XurlFree( urlinfo u, const char * msg, + const char * file, unsigned line); #define urlFree(_u, _msg) XurlFree(_u, _msg, __FILE__, __LINE__) /** * Free cached URL control structures. */ -void urlFreeCache(void) - /*@globals _url_cache, _url_count, fileSystem, internalState @*/ - /*@modifies _url_cache, _url_count, fileSystem, internalState @*/; +void urlFreeCache(void); /** * Return type of URL. * @param url url string * @return type of url */ -urltype urlIsURL(const char * url) - /*@*/; +urltype urlIsURL(const char * url); /** * Return path component of URL. @@ -163,11 +137,7 @@ urltype urlIsURL(const char * url) * @retval pathp pointer to path component of url * @return type of url */ -/*@-incondefs@*/ -urltype urlPath(const char * url, /*@out@*/ const char ** pathp) - /*@ensures maxSet(*pathp) == 0 /\ maxRead(*pathp) == 0 @*/ - /*@modifies *pathp @*/; -/*@=incondefs@*/ +urltype urlPath(const char * url, const char ** pathp); /** * Parse URL string into a control structure. @@ -175,9 +145,7 @@ urltype urlPath(const char * url, /*@out@*/ const char ** pathp) * @retval uret address of new control instance pointer * @return 0 on success, -1 on error */ -int urlSplit(const char * url, /*@out@*/ urlinfo * uret) - /*@globals h_errno, internalState @*/ - /*@modifies *uret, internalState @*/; +int urlSplit(const char * url, urlinfo * uret); /** * Copy data from URL to local file. @@ -185,9 +153,7 @@ int urlSplit(const char * url, /*@out@*/ urlinfo * uret) * @param dest file name of destination * @return 0 on success, otherwise FTPERR_* code */ -int urlGetFile(const char * url, /*@null@*/ const char * dest) - /*@globals h_errno, fileSystem, internalState @*/ - /*@modifies fileSystem, internalState @*/; +int urlGetFile(const char * url, const char * dest); #ifdef __cplusplus } -- cgit v1.2.3