# HG changeset patch # User Matti Hamalainen # Date 1352201665 -7200 # Node ID 37ab2fba30c8bafc747589ddab58fcd6a2580a0c # Parent 64352e85113e1993d560e8356f81e7a21dd6b217 More cleanups. diff -r 64352e85113e -r 37ab2fba30c8 src/xmms-sid.h --- a/src/xmms-sid.h Tue Nov 06 13:31:36 2012 +0200 +++ b/src/xmms-sid.h Tue Nov 06 13:34:25 2012 +0200 @@ -126,12 +126,6 @@ #define XS_CS_STIL(M) M #define XS_CS_FREE(M) -/* Shorthands for linked lists - */ -#define LPREV (node->prev) -#define LTHIS (node) -#define LNEXT (node->next) - /* Plugin-wide typedefs */ diff -r 64352e85113e -r 37ab2fba30c8 src/xs_length.c --- a/src/xs_length.c Tue Nov 06 13:31:36 2012 +0200 +++ b/src/xs_length.c Tue Nov 06 13:34:25 2012 +0200 @@ -43,17 +43,17 @@ */ static void xs_sldb_node_insert(XSSLDB *db, XSSLDBNode *node) { - assert(db); + assert(db != NULL); if (db->nodes) { - LPREV = db->nodes->prev; + node->prev = db->nodes->prev; db->nodes->prev->next = node; db->nodes->prev = node; } else { db->nodes = node; - LPREV = node; + node->prev = node; } - LNEXT = NULL; + node->next = NULL; } diff -r 64352e85113e -r 37ab2fba30c8 src/xs_stil.c --- a/src/xs_stil.c Tue Nov 06 13:31:36 2012 +0200 +++ b/src/xs_stil.c Tue Nov 06 13:34:25 2012 +0200 @@ -126,14 +126,14 @@ assert(db != NULL); if (db->nodes) { - LPREV = db->nodes->prev; + node->prev = db->nodes->prev; db->nodes->prev->next = node; db->nodes->prev = node; } else { db->nodes = node; - LPREV = node; + node->prev = node; } - LNEXT = NULL; + node->next = NULL; }