select: No need to NULL guard lwc_string_unref

Author: tlsa

src/select/computed.c

@@ -192,11 +192,8 @@ css_error css_computed_style_destroy(css_computed_style *style)
 		free(style->quotes);
 	}
 
-	if (style->i.list_style_image != NULL)
-		lwc_string_unref(style->i.list_style_image);
-
-	if (style->i.background_image != NULL)
-		lwc_string_unref(style->i.background_image);
+	lwc_string_unref(style->i.list_style_image);
+	lwc_string_unref(style->i.background_image);
 
 	if (style->calc != NULL)
 		css_calculator_unref(style->calc);

src/select/font_face.c

@@ -16,9 +16,7 @@ static void font_faces_srcs_destroy(css_font_face *font_face)
 	css_font_face_src *srcs = font_face->srcs;
 
 	for (i = 0; i < font_face->n_srcs; ++i) {
-		if (srcs[i].location != NULL) {
-			lwc_string_unref(srcs[i].location);
-		}
+		lwc_string_unref(srcs[i].location);
 	}
 
 	free(srcs);
@@ -69,8 +67,7 @@ css_error css__font_face_destroy(css_font_face *font_face)
 	if (font_face == NULL)
 		return CSS_BADPARM;
 
-	if (font_face->font_family != NULL)
-		lwc_string_unref(font_face->font_family);
+	lwc_string_unref(font_face->font_family);
 
 	if (font_face->srcs != NULL)
 		font_faces_srcs_destroy(font_face);
@@ -96,8 +93,7 @@ css_error css__font_face_set_font_family(css_font_face *font_face,
 	if (font_face == NULL || font_family == NULL)
 		return CSS_BADPARM;
 
-	if (font_face->font_family != NULL)
-		lwc_string_unref(font_face->font_family);
+	lwc_string_unref(font_face->font_family);
 
 	font_face->font_family = lwc_string_ref(font_family);
 

src/select/properties/background_image.c

@@ -27,8 +27,7 @@ css_error css__set_background_image_from_hint(const css_hint *hint,
 
 	error = set_background_image(style, hint->status, hint->data.string);
 
-	if (hint->data.string != NULL)
-		lwc_string_unref(hint->data.string);
+	lwc_string_unref(hint->data.string);
 
 	return error;
 }

src/select/properties/list_style_image.c

@@ -27,8 +27,7 @@ css_error css__set_list_style_image_from_hint(const css_hint *hint,
 
 	error = set_list_style_image(style, hint->status, hint->data.string);
 
-	if (hint->data.string != NULL)
-		lwc_string_unref(hint->data.string);
+	lwc_string_unref(hint->data.string);
 
 	return error;
 }

src/select/select.c

@@ -1031,17 +1031,9 @@ static void css_select__finalise_selection_state(
 		}
 	}
 
-	if (state->id != NULL) {
-		lwc_string_unref(state->id);
-	}
-
-	if (state->element.ns != NULL) {
-		lwc_string_unref(state->element.ns);
-	}
-
-	if (state->element.name != NULL){
-		lwc_string_unref(state->element.name);
-	}
+	lwc_string_unref(state->id);
+	lwc_string_unref(state->element.ns);
+	lwc_string_unref(state->element.name);
 
 	if (state->revert != NULL) {
 		for (size_t i = 0; i < CSS_ORIGIN_AUTHOR; i++) {

src/select/strings.c

@@ -200,65 +200,35 @@ css_error css_select_strings_intern(css_select_strings *str)
 
 void css_select_strings_unref(css_select_strings *str)
 {
-	if (str->universal != NULL)
-		lwc_string_unref(str->universal);
-	if (str->first_child != NULL)
-		lwc_string_unref(str->first_child);
-	if (str->link != NULL)
-		lwc_string_unref(str->link);
-	if (str->visited != NULL)
-		lwc_string_unref(str->visited);
-	if (str->hover != NULL)
-		lwc_string_unref(str->hover);
-	if (str->active != NULL)
-		lwc_string_unref(str->active);
-	if (str->focus != NULL)
-		lwc_string_unref(str->focus);
-	if (str->nth_child != NULL)
-		lwc_string_unref(str->nth_child);
-	if (str->nth_last_child != NULL)
-		lwc_string_unref(str->nth_last_child);
-	if (str->nth_of_type != NULL)
-		lwc_string_unref(str->nth_of_type);
-	if (str->nth_last_of_type != NULL)
-		lwc_string_unref(str->nth_last_of_type);
-	if (str->last_child != NULL)
-		lwc_string_unref(str->last_child);
-	if (str->first_of_type != NULL)
-		lwc_string_unref(str->first_of_type);
-	if (str->last_of_type != NULL)
-		lwc_string_unref(str->last_of_type);
-	if (str->only_child != NULL)
-		lwc_string_unref(str->only_child);
-	if (str->only_of_type != NULL)
-		lwc_string_unref(str->only_of_type);
-	if (str->root != NULL)
-		lwc_string_unref(str->root);
-	if (str->empty != NULL)
-		lwc_string_unref(str->empty);
-	if (str->target != NULL)
-		lwc_string_unref(str->target);
-	if (str->lang != NULL)
-		lwc_string_unref(str->lang);
-	if (str->enabled != NULL)
-		lwc_string_unref(str->enabled);
-	if (str->disabled != NULL)
-		lwc_string_unref(str->disabled);
-	if (str->checked != NULL)
-		lwc_string_unref(str->checked);
-	if (str->first_line != NULL)
-		lwc_string_unref(str->first_line);
-	if (str->first_letter != NULL)
-		lwc_string_unref(str->first_letter);
-	if (str->before != NULL)
-		lwc_string_unref(str->before);
-	if (str->after != NULL)
-		lwc_string_unref(str->after);
-
-	if (str->width != NULL)
-		lwc_string_unref(str->width);
-	if (str->height != NULL)
-		lwc_string_unref(str->height);
-	if (str->prefers_color_scheme != NULL)
-		lwc_string_unref(str->prefers_color_scheme);
+	lwc_string_unref(str->universal);
+	lwc_string_unref(str->first_child);
+	lwc_string_unref(str->link);
+	lwc_string_unref(str->visited);
+	lwc_string_unref(str->hover);
+	lwc_string_unref(str->active);
+	lwc_string_unref(str->focus);
+	lwc_string_unref(str->nth_child);
+	lwc_string_unref(str->nth_last_child);
+	lwc_string_unref(str->nth_of_type);
+	lwc_string_unref(str->nth_last_of_type);
+	lwc_string_unref(str->last_child);
+	lwc_string_unref(str->first_of_type);
+	lwc_string_unref(str->last_of_type);
+	lwc_string_unref(str->only_child);
+	lwc_string_unref(str->only_of_type);
+	lwc_string_unref(str->root);
+	lwc_string_unref(str->empty);
+	lwc_string_unref(str->target);
+	lwc_string_unref(str->lang);
+	lwc_string_unref(str->enabled);
+	lwc_string_unref(str->disabled);
+	lwc_string_unref(str->checked);
+	lwc_string_unref(str->first_line);
+	lwc_string_unref(str->first_letter);
+	lwc_string_unref(str->before);
+	lwc_string_unref(str->after);
+
+	lwc_string_unref(str->width);
+	lwc_string_unref(str->height);
+	lwc_string_unref(str->prefers_color_scheme);
 }