summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorManish Singh <yosh@gimp.org>2004-09-21 23:53:27 +0000
committerManish Singh <yosh@src.gnome.org>2004-09-21 23:53:27 +0000
commit3f280a16993db91eecf3d123ea402f60189a1134 (patch)
tree2f1d87c280259cf351e7807343c3c97417e0a604
parent1d3846451d0a087bea168f8be14ec01b1483c371 (diff)
downloadgtk+-3f280a16993db91eecf3d123ea402f60189a1134.tar.gz
#include <config.h> for HAVE_MALLINFO define, other minor cleanups.
Tue Sep 21 16:55:38 2004 Manish Singh <yosh@gimp.org> * tests/testtreemodel.c: #include <config.h> for HAVE_MALLINFO define, other minor cleanups.
-rw-r--r--ChangeLog5
-rw-r--r--ChangeLog.pre-2-105
-rw-r--r--ChangeLog.pre-2-65
-rw-r--r--ChangeLog.pre-2-85
-rw-r--r--tests/testtreemodel.c13
5 files changed, 27 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 9868d769d4..a2c9ae574c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Sep 21 16:55:38 2004 Manish Singh <yosh@gimp.org>
+
+ * tests/testtreemodel.c: #include <config.h> for HAVE_MALLINFO define,
+ other minor cleanups.
+
Tue Sep 21 16:27:19 2004 Manish Singh <yosh@gimp.org>
* gdk/gdk.c: remove now unused arg variables.
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9868d769d4..a2c9ae574c 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Tue Sep 21 16:55:38 2004 Manish Singh <yosh@gimp.org>
+
+ * tests/testtreemodel.c: #include <config.h> for HAVE_MALLINFO define,
+ other minor cleanups.
+
Tue Sep 21 16:27:19 2004 Manish Singh <yosh@gimp.org>
* gdk/gdk.c: remove now unused arg variables.
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9868d769d4..a2c9ae574c 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Tue Sep 21 16:55:38 2004 Manish Singh <yosh@gimp.org>
+
+ * tests/testtreemodel.c: #include <config.h> for HAVE_MALLINFO define,
+ other minor cleanups.
+
Tue Sep 21 16:27:19 2004 Manish Singh <yosh@gimp.org>
* gdk/gdk.c: remove now unused arg variables.
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9868d769d4..a2c9ae574c 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Tue Sep 21 16:55:38 2004 Manish Singh <yosh@gimp.org>
+
+ * tests/testtreemodel.c: #include <config.h> for HAVE_MALLINFO define,
+ other minor cleanups.
+
Tue Sep 21 16:27:19 2004 Manish Singh <yosh@gimp.org>
* gdk/gdk.c: remove now unused arg variables.
diff --git a/tests/testtreemodel.c b/tests/testtreemodel.c
index 56b986b3f9..e8b1abe9ee 100644
--- a/tests/testtreemodel.c
+++ b/tests/testtreemodel.c
@@ -17,9 +17,14 @@
* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
+
+#include <string.h>
+
#ifdef HAVE_MALLINFO
#include <malloc.h>
#endif
+
#include <gtk/gtk.h>
static gint repeats = 2;
@@ -187,7 +192,6 @@ tree_store_insert_deep (GtkTreeModel *model,
GtkTreeIter iter;
gchar *text;
FindData data;
- gint n;
text = g_strdup_printf ("row %d", i);
data.n = g_random_int_range (0, items);
@@ -195,7 +199,7 @@ tree_store_insert_deep (GtkTreeModel *model,
data.found = FALSE;
if (data.n < i)
gtk_tree_model_foreach (model, find_nth, &data);
- gtk_tree_store_insert (store, &iter, data.found ? &(data.iter) : NULL, n);
+ gtk_tree_store_insert (store, &iter, data.found ? &(data.iter) : NULL, data.n);
gtk_tree_store_set (store, &iter, 0, i, 1, text, -1);
g_free (text);
}
@@ -207,12 +211,10 @@ test_run (gchar *title,
ClearFunc *clear,
InsertFunc *insert)
{
- GtkTreeIter iter;
gint i, k, d, items;
- gchar *text;
GTimer *timer;
gdouble elapsed;
- int uordblks_before, memused;
+ int uordblks_before = 0, memused;
g_print ("%s (average over %d runs, time in milliseconds)\n"
"items \ttime \ttime/item \tused memory\n", title, repeats);
@@ -253,7 +255,6 @@ int
main (int argc, char *argv[])
{
GtkTreeModel *model;
- GOptionContext *context;
gtk_init_with_args (&argc, &argv, NULL, entries, NULL, NULL);