callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't leave NULL's in argv.

Browse Source 
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.
This commit is contained in:
Owen Taylor 1998-03-14 07:16:36 +00:00 committed by Owen Taylor
parent f9ad283402
commit 54a9eb416d
10 changed files with 44 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
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> Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags * gtk-config.in: Added -I $exec_prefix/glib/include to cflags

4
ChangeLog.pre-2-0
View File

@ -1,3 +1,7 @@
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> Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags * gtk-config.in: Added -I $exec_prefix/glib/include to cflags

4
ChangeLog.pre-2-10
View File

@ -1,3 +1,7 @@
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> Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags * gtk-config.in: Added -I $exec_prefix/glib/include to cflags

4
ChangeLog.pre-2-2
View File

@ -1,3 +1,7 @@
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> Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags * gtk-config.in: Added -I $exec_prefix/glib/include to cflags

4
ChangeLog.pre-2-4
View File

@ -1,3 +1,7 @@
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> Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags * gtk-config.in: Added -I $exec_prefix/glib/include to cflags

4
ChangeLog.pre-2-6
View File

@ -1,3 +1,7 @@
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> Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags * gtk-config.in: Added -I $exec_prefix/glib/include to cflags

4
ChangeLog.pre-2-8
View File

@ -1,3 +1,7 @@
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> Sat Mar 14 01:36:51 1998 Owen Taylor <owt1@cornell.edu>
* gtk-config.in: Added -I $exec_prefix/glib/include to cflags * gtk-config.in: Added -I $exec_prefix/glib/include to cflags

6
gdk/gdk.c
View File

@ -311,12 +311,6 @@ gdk_init (int *argc,
for (i = 1; i < *argc;) for (i = 1; i < *argc;)
{ {
if ((*argv)[i] == NULL)
{
i += 1;
continue;
}
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
if (strcmp ("--gdk-debug", (*argv)[i]) == 0) if (strcmp ("--gdk-debug", (*argv)[i]) == 0)
{ {

6
gdk/x11/gdkmain-x11.c
View File

@ -311,12 +311,6 @@ gdk_init (int *argc,
for (i = 1; i < *argc;) for (i = 1; i < *argc;)
{ {
if ((*argv)[i] == NULL)
{
i += 1;
continue;
}
#ifdef G_ENABLE_DEBUG #ifdef G_ENABLE_DEBUG
if (strcmp ("--gdk-debug", (*argv)[i]) == 0) if (strcmp ("--gdk-debug", (*argv)[i]) == 0)
{ {

23
gtk/gtkmain.c
View File

@ -204,16 +204,10 @@ gtk_init (int *argc,
if (argc && argv) if (argc && argv)
{ {
gint i; gint i, j, k;
for (i = 1; i < *argc;) for (i = 1; i < *argc;)
{ {
if ((*argv)[i] == NULL)
{
i += 1;
continue;
}
if (strcmp ("--gtk-debug", (*argv)[i]) == 0) if (strcmp ("--gtk-debug", (*argv)[i]) == 0)
{ {
(*argv)[i] = NULL; (*argv)[i] = NULL;
@ -242,6 +236,21 @@ gtk_init (int *argc,
} }
i += 1; 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 */ #endif /* G_ENABLE_DEBUG */