uri_get(NULL) and uri_put(NULL) are explicitly allowed.

diff --git a/src/core/cwuri.c b/src/core/cwuri.c
index cf5e90f..c7f0138 100644 (file)
--- a/src/core/cwuri.c
+++ b/src/core/cwuri.c
@@ -33,10 +33,9 @@ struct uri *cwuri = NULL;
 /**
  * Change working URI
  *
 /**
  * Change working URI
  *

- * @v uri              New working URI
+ * @v uri              New working URI, or NULL

  */
 void churi ( struct uri *uri ) {
  */
 void churi ( struct uri *uri ) {

-       if ( cwuri )
-               uri_put ( cwuri );
+       uri_put ( cwuri );

        cwuri = uri_get ( uri );
 }
        cwuri = uri_get ( uri );
 }

diff --git a/src/include/gpxe/uri.h b/src/include/gpxe/uri.h
index 2cf3583..514bc47 100644 (file)
--- 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
  *
 /**
  * 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 ) {
  */
 static inline __attribute__ (( always_inline )) struct uri *
 uri_get ( struct uri *uri ) {