diff options
| author | jbj <devnull@localhost> | 2004-11-05 16:00:31 +0000 |
|---|---|---|
| committer | jbj <devnull@localhost> | 2004-11-05 16:00:31 +0000 |
| commit | 368da1cf2677927f1d59b96a074b5cb6cffc04b3 (patch) | |
| tree | 5a0ce8f231eaba4466108700f4c8249c85ae12db /rpmio/rpmurl.h | |
| parent | 04724d83c32a5cb9fe7ee4cd5411d60e768e26d3 (diff) | |
| download | rpm-368da1cf2677927f1d59b96a074b5cb6cffc04b3.tar.gz rpm-368da1cf2677927f1d59b96a074b5cb6cffc04b3.tar.bz2 rpm-368da1cf2677927f1d59b96a074b5cb6cffc04b3.zip | |
Store server capabilities and lockstore in urlinfo.
Attach urlinfo to fetch context prior to ripping ne_parse_uri.
Substitute /u->service/u->scheme/ everywhere to conform with modern usage.
Splint clean.
CVS patchset: 7543
CVS date: 2004/11/05 16:00:31
Diffstat (limited to 'rpmio/rpmurl.h')
| -rw-r--r-- | rpmio/rpmurl.h | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/rpmio/rpmurl.h b/rpmio/rpmurl.h index 3ecb37f04..77ecd1afc 100644 --- a/rpmio/rpmurl.h +++ b/rpmio/rpmurl.h @@ -29,29 +29,35 @@ typedef /*@abstract@*/ /*@refcounted@*/ struct urlinfo_s * urlinfo; */ struct urlinfo_s { /*@refs@*/ int nrefs; /*!< no. of references */ -/*@owned@*/ /*@null@*/ +/*@owned@*/ /*@relnull@*/ const char * url; /*!< copy of original url */ +/*@owned@*/ /*@relnull@*/ + const char * scheme; /*!< URI scheme. */ /*@owned@*/ /*@null@*/ - const char * service; -/*@owned@*/ /*@null@*/ - const char * user; + const char * user; /*!< URI user. */ /*@owned@*/ /*@null@*/ - const char * password; + const char * password; /*!< URI password. */ +/*@owned@*/ /*@relnull@*/ + const char * host; /*!< URI host. */ /*@owned@*/ /*@null@*/ - const char * host; -/*@owned@*/ /*@null@*/ - const char * portstr; + 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; - int urltype; + int port; /*!< URI port. */ + int urltype; /*!< URI type. */ FD_t ctrl; /*!< control channel */ FD_t data; /*!< per-xfer data channel */ - void * sess; - void * lock_store; + +/*@relnull@*/ + void * capabilities; /*!< neon ne_server_capabilities ptr */ +/*@relnull@*/ + void * lockstore; /*!< neon ne_lock_store ptr */ +/*@relnull@*/ + void * sess; /*!< neon ne_session ptr */ + int bufAlloced; /*!< sizeof I/O buffer */ /*@owned@*/ char * buf; /*!< I/O buffer */ |