gspawn: rename G_SPAWN_ERROR_2BIG to be more bindings-friendly

Rename G_SPAWN_ERROR_2BIG to G_SPAWN_ERROR_TOO_BIG (while keeping the
old name for compatibility), to fix problems with language bindings
where the old name translates into something that would be
syntactically invalid due to starting with a digit.

https://bugzilla.gnome.org/show_bug.cgi?id=671025

diff --git a/glib/gspawn.c b/glib/gspawn.c
index 388b654..1bf380f 100644 (file)
--- a/glib/gspawn.c
+++ b/glib/gspawn.c
@@ -797,7 +797,7 @@ exec_err_to_g_error (gint en)
 
 #ifdef E2BIG
     case E2BIG:
-      return G_SPAWN_ERROR_2BIG;
+      return G_SPAWN_ERROR_TOO_BIG;
       break;
 #endif
 

diff --git a/glib/gspawn.h b/glib/gspawn.h
index fe7785b..bdac189 100644 (file)
--- a/glib/gspawn.h
+++ b/glib/gspawn.h
@@ -47,7 +47,8 @@ G_BEGIN_DECLS
  * @G_SPAWN_ERROR_CHDIR: Changing to working directory failed.
  * @G_SPAWN_ERROR_ACCES: execv() returned <literal>EACCES</literal>
  * @G_SPAWN_ERROR_PERM: execv() returned <literal>EPERM</literal>
- * @G_SPAWN_ERROR_2BIG: execv() returned <literal>E2BIG</literal>
+ * @G_SPAWN_ERROR_TOO_BIG: execv() returned <literal>E2BIG</literal>
+ * @G_SPAWN_ERROR_2BIG: deprecated alias for %G_SPAWN_ERROR_TOO_BIG
  * @G_SPAWN_ERROR_NOEXEC: execv() returned <literal>ENOEXEC</literal>
  * @G_SPAWN_ERROR_NAMETOOLONG: execv() returned <literal>ENAMETOOLONG</literal>
  * @G_SPAWN_ERROR_NOENT: execv() returned <literal>ENOENT</literal>
@@ -73,7 +74,10 @@ typedef enum
   G_SPAWN_ERROR_CHDIR,  /* changing to working dir failed */
   G_SPAWN_ERROR_ACCES,  /* execv() returned EACCES */
   G_SPAWN_ERROR_PERM,   /* execv() returned EPERM */
-  G_SPAWN_ERROR_2BIG,   /* execv() returned E2BIG */
+  G_SPAWN_ERROR_TOO_BIG,/* execv() returned E2BIG */
+#ifndef G_DISABLE_DEPRECATED
+  G_SPAWN_ERROR_2BIG = G_SPAWN_ERROR_TOO_BIG,
+#endif
   G_SPAWN_ERROR_NOEXEC, /* execv() returned ENOEXEC */
   G_SPAWN_ERROR_NAMETOOLONG, /* ""  "" ENAMETOOLONG */
   G_SPAWN_ERROR_NOENT,       /* ""  "" ENOENT */