From be89f523f6cb4ef23ea9058465cd07a36bb3ffad Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Sat, 13 Aug 2016 00:08:41 +0100
Subject: [PATCH] cleanup

---
 lib_list.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib_list.cc b/lib_list.cc
index 1ac44f4..e798ad0 100644
--- a/lib_list.cc
+++ b/lib_list.cc
@@ -153,10 +153,6 @@ namespace util {
     }
 }
 
-struct NullValue: TaggedValue {
-    NullValue() { set_null(); }
-} const null_value;
-
 static inline void cs_set_iter(Ident &id, char *val, IdentStack &stack) {
     if (id.stack == &stack) {
         if (id.get_valtype() == VAL_STR) {
@@ -630,9 +626,13 @@ static void cs_list_sort(
         return;
     }
 
+    /* default null value, set later from callback */
+    TaggedValue nv;
+    nv.set_null();
+
     IdentStack xstack, ystack;
-    x->push_arg(null_value, xstack);
-    y->push_arg(null_value, ystack);
+    x->push_arg(nv, xstack);
+    y->push_arg(nv, ystack);
 
     ostd::Size totaluniq = total;
     ostd::Size nuniq = items.size();