Changeset 6ad7bed

Timestamp:

Nov 6, 2010, 6:34:03 PM (13 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.7, release-1.8, release-1.9

Children:

ce35060

Parents:

1d81c51

git-author:

David Benjamin <davidben@mit.edu> (08/07/10 21:07:19)

git-committer:

Anders Kaseorg <andersk@mit.edu> (11/06/10 18:34:03)

Message:

Avoid stripping parameters for function calls in window.c

Although glib depends on this cast to work, clang tries to inline
owl_window_children_foreach and emits a warning. Unfortunately, we still
depend on this trick to work in general, by depending on glib.

Reported-By: Anders Kaseorg <andersk@mit.edu>

File:

• window.c (modified) (6 diffs)

window.c

@@ -45 +45 @@
 static owl_window *default_cursor;
 
+/* clang gets upset about the glib argument chopping hack because it manages to
+ * inline owl_window_children_foreach. user_data should be a pointer to a
+ * FuncOneArg. */
+typedef void (*FuncOneArg)(void *);
+static void first_arg_only(gpointer data, gpointer user_data)
+{
+  FuncOneArg *func = user_data;
+  (*func)(data);
+}
+
 G_DEFINE_TYPE (OwlWindow, owl_window, G_TYPE_OBJECT)
 
@@ -288 +298 @@
 {
   owl_window_show(w);
-  owl_window_children_foreach(w, (GFunc)owl_window_show, 0);
+  FuncOneArg ptr = (FuncOneArg)owl_window_show;
+  owl_window_children_foreach(w, first_arg_only, &ptr);
 }
 
@@ -348 +359 @@
   owl_window_dirty(w);
   /* map the children */
-  owl_window_children_foreach(w, (GFunc)_owl_window_realize_later, 0);
+  FuncOneArg ptr = (FuncOneArg)_owl_window_realize_later;
+  owl_window_children_foreach(w, first_arg_only, &ptr);
 }
 
@@ -356 +368 @@
     return;
   /* unmap all the children */
-  owl_window_children_foreach(w, (GFunc)_owl_window_unrealize, 0);
+  FuncOneArg ptr = (FuncOneArg)_owl_window_unrealize;
+  owl_window_children_foreach(w, first_arg_only, &ptr);
   _owl_window_destroy_curses(w);
   w->dirty = w->dirty_subtree = 0;
@@ -410 +423 @@
 void owl_window_dirty_children(owl_window *w)
 {
-  owl_window_children_foreach(w, (GFunc)owl_window_dirty, 0);
+  FuncOneArg ptr = (FuncOneArg)owl_window_dirty;
+  owl_window_children_foreach(w, first_arg_only, &ptr);
 }
 
@@ -434 +448 @@
     return;
   _owl_window_redraw(w);
-  owl_window_children_foreach(w, (GFunc)_owl_window_redraw_subtree, 0);
+  FuncOneArg ptr = (FuncOneArg)_owl_window_redraw_subtree;
+  owl_window_children_foreach(w, first_arg_only, &ptr);
   w->dirty_subtree = 0;
 }