nsurl: Tidy up component helper macros.

utils/nsurl/nsurl.c

@@ -50,8 +50,13 @@
 #undef NSURL_DEBUG
 
 
-#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
-
+/**
+ * Compare two component values.
+ *
+ * Sets match to false if the components are not the same.
+ * Does nothing if the components are the same, so ensure match is
+ * preset to true.
+ */
 #define nsurl__component_compare(c1, c2, match)	      		\
 	if (c1 && c2 && lwc_error_ok ==				\
 			lwc_string_isequal(c1, c2, match)) {	\

utils/nsurl/parse.c

@@ -81,16 +81,6 @@ enum url_sections {
 };
 
 
-#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
-
-#define nsurl__component_compare(c1, c2, match)	      		\
-	if (c1 && c2 && lwc_error_ok ==				\
-			lwc_string_isequal(c1, c2, match)) {	\
-		/* do nothing */                                \
-	} else if (c1 || c2) {					\
-		*match = false;					\
-	}
-
 /**
  * Return a hex digit for the given numerical value.
  *

utils/nsurl/private.h

@@ -107,6 +107,11 @@ enum nsurl_string_flags {
 	NSURL_F_FRAGMENT		= (1 << 11)
 };
 
+/**
+ * NULL-safe lwc_string_ref
+ */
+#define nsurl__component_copy(c) (c == NULL) ? NULL : lwc_string_ref(c)
+
 
 /**
  * Convert a set of nsurl components to a single string