utils: No need to NULL protect lwc_string_unref

Author: tlsa

utils/corestrings.c

@@ -41,10 +41,8 @@ nserror corestrings_fini(void)
 {
 #define CORESTRING_LWC_VALUE(NAME,VALUE)				\
 	do {								\
-		if (corestring_lwc_##NAME != NULL) {			\
-			lwc_string_unref(corestring_lwc_##NAME);	\
-			corestring_lwc_##NAME = NULL;			\
-		}							\
+		lwc_string_unref(corestring_lwc_##NAME);		\
+		corestring_lwc_##NAME = NULL;				\
 	} while (0)
 
 #define CORESTRING_DOM_VALUE(NAME,VALUE)				\

utils/http/cache-control.c

@@ -49,9 +49,7 @@ typedef struct http_directive {
 static void http_destroy_directive(http_directive *self)
 {
 	lwc_string_unref(self->name);
-	if (self->value != NULL) {
-		lwc_string_unref(self->value);
-	}
+	lwc_string_unref(self->value);
 	free(self);
 }
 
@@ -90,9 +88,7 @@ static nserror http__parse_directive(const char **input,
 
 	directive = malloc(sizeof(*directive));
 	if (directive == NULL) {
-		if (value != NULL) {
-			lwc_string_unref(value);
-		}
+		lwc_string_unref(value);
 		lwc_string_unref(name);
 		return NSERROR_NOMEM;
 	}
@@ -189,9 +185,7 @@ static bool check_duplicates(const http_directive *directives)
 		result &= (count(directives, name) == 1);
 
 		lwc_string_unref(name);
-		if (value != NULL) {
-			lwc_string_unref(value);
-		}
+		lwc_string_unref(value);
 	} while (key != NULL);
 
 	return result;
@@ -290,19 +284,15 @@ nserror http_parse_cache_control(const char *header_value,
 			corestring_lwc_no_cache, &value_str);
 	if (error == NSERROR_OK) {
 		no_cache = true;
-		if (value_str != NULL) {
-			lwc_string_unref(value_str);
-		}
+		lwc_string_unref(value_str);
 	}
 
 	/* Find no-store */
 	error = http_directive_list_find_item(directives,
 			corestring_lwc_no_store, &value_str);
 	if (error == NSERROR_OK) {
 		no_store = true;
-		if (value_str != NULL) {
-			lwc_string_unref(value_str);
-		}
+		lwc_string_unref(value_str);
 	}
 
 	http_directive_list_destroy(directives);

utils/http/strict-transport-security.c

@@ -47,9 +47,7 @@ typedef struct http_directive {
 static void http_destroy_directive(http_directive *self)
 {
 	lwc_string_unref(self->name);
-	if (self->value != NULL) {
-		lwc_string_unref(self->value);
-	}
+	lwc_string_unref(self->value);
 	free(self);
 }
 
@@ -88,9 +86,7 @@ static nserror http__parse_directive(const char **input,
 
 	directive = malloc(sizeof(*directive));
 	if (directive == NULL) {
-		if (value != NULL) {
-			lwc_string_unref(value);
-		}
+		lwc_string_unref(value);
 		lwc_string_unref(name);
 		return NSERROR_NOMEM;
 	}
@@ -187,9 +183,7 @@ static bool check_duplicates(const http_directive *directives)
 		result &= (count(directives, name) == 1);
 
 		lwc_string_unref(name);
-		if (value != NULL) {
-			lwc_string_unref(value);
-		}
+		lwc_string_unref(value);
 	} while (key != NULL);
 
 	return result;

utils/nsurl/nsurl.c

@@ -641,9 +641,7 @@ nserror nsurl_replace_query(const nsurl *url, const char *query,
 	/* Create NetSurf URL object */
 	*new_url = malloc(sizeof(nsurl) + length + 1); /* Add 1 for \0 */
 	if (*new_url == NULL) {
-		if (query_len > 0) {
-			lwc_string_unref(lwc_query);
-		}
+		lwc_string_unref(lwc_query);
 		return NSERROR_NOMEM;
 	}
 

utils/nsurl/private.h

@@ -137,29 +137,14 @@ void nsurl__calc_hash(nsurl *url);
  */
 static inline void nsurl__components_destroy(struct nsurl_components *c)
 {
-	if (c->scheme)
-		lwc_string_unref(c->scheme);
-
-	if (c->username)
-		lwc_string_unref(c->username);
-
-	if (c->password)
-		lwc_string_unref(c->password);
-
-	if (c->host)
-		lwc_string_unref(c->host);
-
-	if (c->port)
-		lwc_string_unref(c->port);
-
-	if (c->path)
-		lwc_string_unref(c->path);
-
-	if (c->query)
-		lwc_string_unref(c->query);
-
-	if (c->fragment)
-		lwc_string_unref(c->fragment);
+	lwc_string_unref(c->scheme);
+	lwc_string_unref(c->username);
+	lwc_string_unref(c->password);
+	lwc_string_unref(c->host);
+	lwc_string_unref(c->port);
+	lwc_string_unref(c->path);
+	lwc_string_unref(c->query);
+	lwc_string_unref(c->fragment);
 }
 
 #endif