diff options
author | Owen Taylor <otaylor@redhat.com> | 2001-02-02 20:25:13 +0000 |
---|---|---|
committer | Owen Taylor <otaylor@src.gnome.org> | 2001-02-02 20:25:13 +0000 |
commit | 73c002cae414a67cb75a739f6430692ef3531cd8 (patch) | |
tree | 840b9189fde5cdf42cd9e6d404f7f0248173f59a | |
parent | 9f56908ea303e11bc9b74cb52fa86ad77f9807f9 (diff) | |
download | gdk-pixbuf-73c002cae414a67cb75a739f6430692ef3531cd8.tar.gz |
Fix problem with passing signed chars to isupper() / tolower().
Fri Feb 2 15:09:51 2001 Owen Taylor <otaylor@redhat.com>
* gtk/fnmatch.c (FOLD): Fix problem with passing signed
chars to isupper() / tolower().
* examples/packer/pack.c: Add GINT_TO_POINTER, GPOINTER_TO_INT
to clear up 64-bit warnings. (#567)
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-0 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-10 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-2 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-4 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-6 | 8 | ||||
-rw-r--r-- | ChangeLog.pre-2-8 | 8 | ||||
-rw-r--r-- | examples/packer/pack.c | 38 | ||||
-rw-r--r-- | gtk/fnmatch.c | 2 |
9 files changed, 76 insertions, 20 deletions
@@ -1,3 +1,11 @@ +Fri Feb 2 15:09:51 2001 Owen Taylor <otaylor@redhat.com> + + * gtk/fnmatch.c (FOLD): Fix problem with passing signed + chars to isupper() / tolower(). + + * examples/packer/pack.c: Add GINT_TO_POINTER, GPOINTER_TO_INT + to clear up 64-bit warnings. (#567) + Fri Feb 2 13:38:21 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmain.c (gtk_propagate_event): Fix some reference diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0 index 96db67abd..a0ed9a32e 100644 --- a/ChangeLog.pre-2-0 +++ b/ChangeLog.pre-2-0 @@ -1,3 +1,11 @@ +Fri Feb 2 15:09:51 2001 Owen Taylor <otaylor@redhat.com> + + * gtk/fnmatch.c (FOLD): Fix problem with passing signed + chars to isupper() / tolower(). + + * examples/packer/pack.c: Add GINT_TO_POINTER, GPOINTER_TO_INT + to clear up 64-bit warnings. (#567) + Fri Feb 2 13:38:21 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmain.c (gtk_propagate_event): Fix some reference diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 96db67abd..a0ed9a32e 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,11 @@ +Fri Feb 2 15:09:51 2001 Owen Taylor <otaylor@redhat.com> + + * gtk/fnmatch.c (FOLD): Fix problem with passing signed + chars to isupper() / tolower(). + + * examples/packer/pack.c: Add GINT_TO_POINTER, GPOINTER_TO_INT + to clear up 64-bit warnings. (#567) + Fri Feb 2 13:38:21 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmain.c (gtk_propagate_event): Fix some reference diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 96db67abd..a0ed9a32e 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,11 @@ +Fri Feb 2 15:09:51 2001 Owen Taylor <otaylor@redhat.com> + + * gtk/fnmatch.c (FOLD): Fix problem with passing signed + chars to isupper() / tolower(). + + * examples/packer/pack.c: Add GINT_TO_POINTER, GPOINTER_TO_INT + to clear up 64-bit warnings. (#567) + Fri Feb 2 13:38:21 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmain.c (gtk_propagate_event): Fix some reference diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 96db67abd..a0ed9a32e 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,11 @@ +Fri Feb 2 15:09:51 2001 Owen Taylor <otaylor@redhat.com> + + * gtk/fnmatch.c (FOLD): Fix problem with passing signed + chars to isupper() / tolower(). + + * examples/packer/pack.c: Add GINT_TO_POINTER, GPOINTER_TO_INT + to clear up 64-bit warnings. (#567) + Fri Feb 2 13:38:21 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmain.c (gtk_propagate_event): Fix some reference diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 96db67abd..a0ed9a32e 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,11 @@ +Fri Feb 2 15:09:51 2001 Owen Taylor <otaylor@redhat.com> + + * gtk/fnmatch.c (FOLD): Fix problem with passing signed + chars to isupper() / tolower(). + + * examples/packer/pack.c: Add GINT_TO_POINTER, GPOINTER_TO_INT + to clear up 64-bit warnings. (#567) + Fri Feb 2 13:38:21 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmain.c (gtk_propagate_event): Fix some reference diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 96db67abd..a0ed9a32e 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,11 @@ +Fri Feb 2 15:09:51 2001 Owen Taylor <otaylor@redhat.com> + + * gtk/fnmatch.c (FOLD): Fix problem with passing signed + chars to isupper() / tolower(). + + * examples/packer/pack.c: Add GINT_TO_POINTER, GPOINTER_TO_INT + to clear up 64-bit warnings. (#567) + Fri Feb 2 13:38:21 2001 Owen Taylor <otaylor@redhat.com> * gtk/gtkmain.c (gtk_propagate_event): Fix some reference diff --git a/examples/packer/pack.c b/examples/packer/pack.c index 6bde2f082..e8e3af487 100644 --- a/examples/packer/pack.c +++ b/examples/packer/pack.c @@ -159,10 +159,10 @@ main (int argv, char **argc) button_left = gtk_toggle_button_new_with_label("Left"); button_right = gtk_toggle_button_new_with_label("Right"); - gtk_object_set_data(GTK_OBJECT(button_top), "side", (gpointer) GTK_SIDE_TOP); - gtk_object_set_data(GTK_OBJECT(button_bottom), "side", (gpointer) GTK_SIDE_BOTTOM); - gtk_object_set_data(GTK_OBJECT(button_left), "side", (gpointer) GTK_SIDE_LEFT); - gtk_object_set_data(GTK_OBJECT(button_right), "side", (gpointer) GTK_SIDE_RIGHT); + gtk_object_set_data(GTK_OBJECT(button_top), "side", GINT_TO_POINTER (GTK_SIDE_TOP)); + gtk_object_set_data(GTK_OBJECT(button_bottom), "side", GINT_TO_POINTER (GTK_SIDE_BOTTOM)); + gtk_object_set_data(GTK_OBJECT(button_left), "side", GINT_TO_POINTER (GTK_SIDE_LEFT)); + gtk_object_set_data(GTK_OBJECT(button_right), "side", GINT_TO_POINTER (GTK_SIDE_RIGHT)); gtk_widget_set_usize(button_top, 50, -1); gtk_widget_set_usize(button_bottom, 50, -1); @@ -230,15 +230,15 @@ main (int argv, char **argc) button_sw = gtk_toggle_button_new_with_label("SW"); button_center = gtk_toggle_button_new_with_label(""); - gtk_object_set_data(GTK_OBJECT(button_n), "anchor", (gpointer) GTK_ANCHOR_N); - gtk_object_set_data(GTK_OBJECT(button_nw), "anchor", (gpointer) GTK_ANCHOR_NW); - gtk_object_set_data(GTK_OBJECT(button_ne), "anchor", (gpointer) GTK_ANCHOR_NE); - gtk_object_set_data(GTK_OBJECT(button_s), "anchor", (gpointer) GTK_ANCHOR_S); - gtk_object_set_data(GTK_OBJECT(button_sw), "anchor", (gpointer) GTK_ANCHOR_SW); - gtk_object_set_data(GTK_OBJECT(button_se), "anchor", (gpointer) GTK_ANCHOR_SE); - gtk_object_set_data(GTK_OBJECT(button_w), "anchor", (gpointer) GTK_ANCHOR_W); - gtk_object_set_data(GTK_OBJECT(button_e), "anchor", (gpointer) GTK_ANCHOR_E); - gtk_object_set_data(GTK_OBJECT(button_center), "anchor", (gpointer) GTK_ANCHOR_CENTER); + gtk_object_set_data(GTK_OBJECT(button_n), "anchor", GINT_TO_POINTER (GTK_ANCHOR_N)); + gtk_object_set_data(GTK_OBJECT(button_nw), "anchor", GINT_TO_POINTER (GTK_ANCHOR_NW)); + gtk_object_set_data(GTK_OBJECT(button_ne), "anchor", GINT_TO_POINTER (GTK_ANCHOR_NE)); + gtk_object_set_data(GTK_OBJECT(button_s), "anchor", GINT_TO_POINTER (GTK_ANCHOR_S)); + gtk_object_set_data(GTK_OBJECT(button_sw), "anchor", GINT_TO_POINTER (GTK_ANCHOR_SW)); + gtk_object_set_data(GTK_OBJECT(button_se), "anchor", GINT_TO_POINTER (GTK_ANCHOR_SE)); + gtk_object_set_data(GTK_OBJECT(button_w), "anchor", GINT_TO_POINTER (GTK_ANCHOR_W)); + gtk_object_set_data(GTK_OBJECT(button_e), "anchor", GINT_TO_POINTER (GTK_ANCHOR_E)); + gtk_object_set_data(GTK_OBJECT(button_center), "anchor", GINT_TO_POINTER (GTK_ANCHOR_CENTER)); gtk_signal_connect (GTK_OBJECT (button_n), "toggled", GTK_SIGNAL_FUNC (toggle_anchor), (gpointer) info); @@ -321,9 +321,9 @@ main (int argv, char **argc) GTK_FILL_X | GTK_PACK_EXPAND, 0, 10, 5, 0, 0); - gtk_object_set_data(GTK_OBJECT(button_fillx), "option", (gpointer) GTK_FILL_X); - gtk_object_set_data(GTK_OBJECT(button_filly), "option", (gpointer) GTK_FILL_Y); - gtk_object_set_data(GTK_OBJECT(button_expand), "option", (gpointer) GTK_PACK_EXPAND); + gtk_object_set_data(GTK_OBJECT(button_fillx), "option", GINT_TO_POINTER (GTK_FILL_X)); + gtk_object_set_data(GTK_OBJECT(button_filly), "option", GINT_TO_POINTER (GTK_FILL_Y)); + gtk_object_set_data(GTK_OBJECT(button_expand), "option", GINT_TO_POINTER (GTK_PACK_EXPAND)); gtk_signal_connect (GTK_OBJECT (button_fillx), "toggled", GTK_SIGNAL_FUNC (toggle_options), (gpointer) info); @@ -373,7 +373,7 @@ toggle_options (GtkWidget *widget, gpointer data) info = (Info*) data; - option = (gint) gtk_object_get_data(GTK_OBJECT(widget), "option"); + option = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "option")); pchild = info->pchild; if (pchild == NULL) { @@ -412,7 +412,7 @@ toggle_anchor (GtkWidget *widget, gpointer data) info = (Info*) data; if (GTK_TOGGLE_BUTTON(widget)->active) { - anchor = (gint) gtk_object_get_data(GTK_OBJECT(widget), "anchor"); + anchor = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "anchor")); pchild = info->pchild; if (pchild == NULL) { @@ -483,7 +483,7 @@ toggle_side (GtkWidget *widget, gpointer data) if (GTK_TOGGLE_BUTTON(widget)->active) { - side = (gint) gtk_object_get_data(GTK_OBJECT(widget), "side"); + side = GPOINTER_TO_INT (gtk_object_get_data(GTK_OBJECT(widget), "side")); pchild = info->pchild; if (pchild == NULL) { diff --git a/gtk/fnmatch.c b/gtk/fnmatch.c index 4aecb7f3d..ec19dcecd 100644 --- a/gtk/fnmatch.c +++ b/gtk/fnmatch.c @@ -66,7 +66,7 @@ fnmatch (pattern, string, flags) register char c; /* Note that this evalutes C many times. */ -#define FOLD(c) ((flags & FNM_CASEFOLD) && isupper (c) ? tolower (c) : (c)) +#define FOLD(c) ((flags & FNM_CASEFOLD) && isupper ((unsigned char )(c)) ? tolower ((unsigned char)(c)) : (c)) while ((c = *p++) != '\0') { |