diff options
| author | Michael Brown <mcb30@etherboot.org> | 2007-08-02 20:26:49 +0100 |
|---|---|---|
| committer | Michael Brown <mcb30@etherboot.org> | 2007-08-02 20:26:49 +0100 |
| commit | 49009a4c1b3ccd10448ea1a2b32daa72b07982b2 (patch) | |
| tree | 1a36e2b474ef8d5ad04feb370ae9ff647521e786 | |
| parent | d4947c05b27449b4320179d57028a0542fd1394f (diff) | |
| download | ipxe-49009a4c1b3ccd10448ea1a2b32daa72b07982b2.tar.gz | |
uri_get(NULL) and uri_put(NULL) are explicitly allowed.
| -rw-r--r-- | src/core/cwuri.c | 5 | ||||
| -rw-r--r-- | src/include/gpxe/uri.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/core/cwuri.c b/src/core/cwuri.c index cf5e90f8..c7f01386 100644 --- a/src/core/cwuri.c +++ b/src/core/cwuri.c @@ -33,10 +33,9 @@ struct uri *cwuri = NULL; /** * Change working URI * - * @v uri New working URI + * @v uri New working URI, or NULL */ void churi ( struct uri *uri ) { - if ( cwuri ) - uri_put ( cwuri ); + uri_put ( cwuri ); cwuri = uri_get ( uri ); } diff --git a/src/include/gpxe/uri.h b/src/include/gpxe/uri.h index 2cf35832..514bc479 100644 --- a/src/include/gpxe/uri.h +++ b/src/include/gpxe/uri.h @@ -105,8 +105,8 @@ static inline int uri_has_relative_path ( struct uri *uri ) { /** * Increment URI reference count * - * @v uri URI - * @ret uri URI + * @v uri URI, or NULL + * @ret uri URI as passed in */ static inline __attribute__ (( always_inline )) struct uri * uri_get ( struct uri *uri ) { |