Add missing allow-none annotations for function parameters.

[platform/upstream/glib.git] / glib / gerror.c

diff --git a/glib/gerror.c b/glib/gerror.c
index 7e2d636..e6ce3c0 100644 (file)
--- a/glib/gerror.c
+++ b/glib/gerror.c
@@ -382,6 +382,14 @@ g_error_new_valist (GQuark       domain,
 {
   GError *error;
 
+  /* Historically, GError allowed this (although it was never meant to work),
+   * and it has significant use in the wild, which g_return_val_if_fail
+   * would break. It should maybe g_return_val_if_fail in GLib 4.
+   * (GNOME#660371, GNOME#560482)
+   */
+  g_warn_if_fail (domain != 0);
+  g_warn_if_fail (format != NULL);
+
   error = g_slice_new (GError);
 
   error->domain = domain;
@@ -484,6 +492,9 @@ g_error_copy (const GError *error)
   GError *copy;
  
   g_return_val_if_fail (error != NULL, NULL);
+  /* See g_error_new_valist for why these don't return */
+  g_warn_if_fail (error->domain != 0);
+  g_warn_if_fail (error->message != NULL);
 
   copy = g_slice_new (GError);
 
@@ -496,7 +507,7 @@ g_error_copy (const GError *error)
 
 /**
  * g_error_matches:
- * @error: a #GError or %NULL
+ * @error: (allow-none): a #GError or %NULL
  * @domain: an error domain
  * @code: an error code
  *
@@ -522,7 +533,7 @@ g_error_matches (const GError *error,
 
 /**
  * g_set_error:
- * @err: a return location for a #GError, or %NULL
+ * @err: (allow-none): a return location for a #GError, or %NULL
  * @domain: error domain
  * @code: error code
  * @format: printf()-style format
@@ -557,7 +568,7 @@ g_set_error (GError      **err,
 
 /**
  * g_set_error_literal:
- * @err: a return location for a #GError, or %NULL
+ * @err: (allow-none): a return location for a #GError, or %NULL
  * @domain: error domain
  * @code: error code
  * @message: error message
@@ -651,7 +662,7 @@ g_error_add_prefix (gchar       **string,
 
 /**
  * g_prefix_error:
- * @err: a return location for a #GError, or %NULL
+ * @err: (allow-none): a return location for a #GError, or %NULL
  * @format: printf()-style format string
  * @...: arguments to @format
  *