Commit 54a9eb41 authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Don't leave NULL's in argv.

Sat Mar 14 02:12:44 1998  Owen Taylor  <owt1@cornell.edu>

	* gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv.
parent f9ad2834
Sat Mar 14 02:12:44 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv.
Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags
......
Sat Mar 14 02:12:44 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv.
Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags
......
Sat Mar 14 02:12:44 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv.
Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags
......
Sat Mar 14 02:12:44 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv.
Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags
......
Sat Mar 14 02:12:44 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv.
Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags
......
Sat Mar 14 02:12:44 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv.
Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags
......
Sat Mar 14 02:12:44 1998 Owen Taylor <owt1@cornell.edu>
* gtk/gtkmain.c gdk/gdk.c: Don't leave NULL's in argv.
Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags
......
......@@ -311,12 +311,6 @@ gdk_init (int *argc,
for (i = 1; i < *argc;)
{
if ((*argv)[i] == NULL)
{
i += 1;
continue;
}
#ifdef G_ENABLE_DEBUG
if (strcmp ("--gdk-debug", (*argv)[i]) == 0)
{
......
......@@ -311,12 +311,6 @@ gdk_init (int *argc,
for (i = 1; i < *argc;)
{
if ((*argv)[i] == NULL)
{
i += 1;
continue;
}
#ifdef G_ENABLE_DEBUG
if (strcmp ("--gdk-debug", (*argv)[i]) == 0)
{
......
......@@ -204,16 +204,10 @@ gtk_init (int *argc,
if (argc && argv)
{
gint i;
gint i, j, k;
for (i = 1; i < *argc;)
{
if ((*argv)[i] == NULL)
{
i += 1;
continue;
}
if (strcmp ("--gtk-debug", (*argv)[i]) == 0)
{
(*argv)[i] = NULL;
......@@ -242,6 +236,21 @@ gtk_init (int *argc,
}
i += 1;
}
for (i = 1; i < *argc; i++)
{
for (k = i; k < *argc; k++)
if ((*argv)[k] != NULL)
break;
if (k > i)
{
k -= i;
for (j = i + k; j < *argc; j++)
(*argv)[j-k] = (*argv)[j];
*argc -= k;
}
}
}
#endif /* G_ENABLE_DEBUG */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment