From 24f08818d9d4fe204c228a65b1a7597f740a1694 Mon Sep 17 00:00:00 2001 From: "N.N." Date: Sat, 23 May 2009 17:32:07 +0000 Subject: canvas_merge (aka glist_merge) is completely unused, even in vanilla. svn path=/trunk/; revision=11484 --- desiredata/src/desire.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/desiredata/src/desire.c b/desiredata/src/desire.c index a4a2cdf3..2817e7fb 100644 --- a/desiredata/src/desire.c +++ b/desiredata/src/desire.c @@ -2029,30 +2029,6 @@ static float gobj_getxforsort(t_gobj *g) { return x1; } -static t_gobj *canvas_merge(t_canvas *x, t_gobj *g1, t_gobj *g2) { -/* - t_gobj *g = 0, *g9 = 0; - float f1 = g1 ? gobj_getxforsort(g1) : 0; - float f2 = g2 ? gobj_getxforsort(g2) : 0; - while (1) { - if (g1 && !(g2 && f1>f2)) { - if (g9) {g9->g_next = g1; g9 = g1;} else g9 = g = g1; - if ((g1 = g1->next())) f1 = gobj_getxforsort(g1); - g9->g_next = 0; - continue; - } - if (g1 || g2) { - if (g9) {g9->g_next = g2; g9 = g2;} else g9 = g = g2; - if ((g2 = g2->next())) f2 = gobj_getxforsort(g2); - g9->g_next = 0; - continue; - } - break; - } - return g; -*/ -} - /* static t_gobj *canvas_dosort(t_canvas *x, t_gobj *g, int nitems) { t_gobj *g2, *g3; -- cgit v1.2.1