Use g_set_error instead of g_error_new; do not check if the error
pointer is non-NULL, because g_set_error() does that internally.
Also, use g_set_error_literal() whenever possible.
&client->priv->network);
if (client->priv->iface == NULL) {
- if (client->priv->error)
- g_set_error (client->priv->error,
+ g_set_error_literal (client->priv->error,
GSSDP_ERROR,
GSSDP_ERROR_FAILED,
"No default route?");
ret = FALSE;
} else if (client->priv->host_ip == NULL) {
- if (client->priv->error)
g_set_error (client->priv->error,
GSSDP_ERROR,
GSSDP_ERROR_NO_IP_ADDRESS,
self = GSSDP_SOCKET_SOURCE (initable);
iface_address = g_inet_address_new_from_string (self->priv->host_ip);
if (iface_address == NULL) {
- if (error != NULL) {
- *error = g_error_new (GSSDP_ERROR,
- GSSDP_ERROR_FAILED,
- "Invalid host ip: %s",
- self->priv->host_ip);
- }
+ g_set_error (error,
+ GSSDP_ERROR,
+ GSSDP_ERROR_FAILED,
+ "Invalid host ip: %s",
+ self->priv->host_ip);
goto error;
}
if (family == G_SOCKET_FAMILY_IPV4)
group = g_inet_address_new_from_string (SSDP_ADDR);
else {
- if (error != NULL) {
- *error = g_error_new_literal (GSSDP_ERROR,
- GSSDP_ERROR_FAILED,
- "IPv6 address");
- }
+ g_set_error_literal (error,
+ GSSDP_ERROR,
+ GSSDP_ERROR_FAILED,
+ "IPv6 address");
goto error;
}