From bbd9ba0b6dac3298ea74602c17563d7856801e9d Mon Sep 17 00:00:00 2001 From: Michael Davidsaver Date: Fri, 5 May 2017 20:13:55 -0400 Subject: [PATCH] std/filters: fix filters test harness --- src/std/filters/arr.c | 9 +++------ src/std/filters/dbnd.c | 9 +++------ src/std/filters/sync.c | 9 +++------ src/std/filters/ts.c | 5 ----- 4 files changed, 9 insertions(+), 23 deletions(-) diff --git a/src/std/filters/arr.c b/src/std/filters/arr.c index 7a4960bcf..0bd73e295 100644 --- a/src/std/filters/arr.c +++ b/src/std/filters/arr.c @@ -215,16 +215,13 @@ static chfPluginIf pif = { static void arrShutdown(void* ignore) { - freeListCleanup(myStructFreeList); + if(myStructFreeList) + freeListCleanup(myStructFreeList); + myStructFreeList = NULL; } static void arrInitialize(void) { - static int firstTime = 1; - - if (!firstTime) return; - firstTime = 0; - if (!myStructFreeList) freeListInitPvt(&myStructFreeList, sizeof(myStruct), 64); diff --git a/src/std/filters/dbnd.c b/src/std/filters/dbnd.c index 64378685a..e96c6b652 100644 --- a/src/std/filters/dbnd.c +++ b/src/std/filters/dbnd.c @@ -124,16 +124,13 @@ static chfPluginIf pif = { static void dbndShutdown(void* ignore) { - freeListCleanup(myStructFreeList); + if(myStructFreeList) + freeListCleanup(myStructFreeList); + myStructFreeList = NULL; } static void dbndInitialize(void) { - static int firstTime = 1; - - if (!firstTime) return; - firstTime = 0; - if (!myStructFreeList) freeListInitPvt(&myStructFreeList, sizeof(myStruct), 64); diff --git a/src/std/filters/sync.c b/src/std/filters/sync.c index e1526545a..d137dd7a9 100644 --- a/src/std/filters/sync.c +++ b/src/std/filters/sync.c @@ -177,16 +177,13 @@ static chfPluginIf pif = { static void syncShutdown(void* ignore) { - freeListCleanup(myStructFreeList); + if(myStructFreeList) + freeListCleanup(myStructFreeList); + myStructFreeList = NULL; } static void syncInitialize(void) { - static int firstTime = 1; - - if (!firstTime) return; - firstTime = 0; - if (!myStructFreeList) freeListInitPvt(&myStructFreeList, sizeof(myStruct), 64); diff --git a/src/std/filters/ts.c b/src/std/filters/ts.c index 59303e881..5925b0bf2 100644 --- a/src/std/filters/ts.c +++ b/src/std/filters/ts.c @@ -59,11 +59,6 @@ static chfPluginIf pif = { static void tsInitialize(void) { - static int firstTime = 1; - - if(!firstTime) return; - firstTime = 0; - chfPluginRegister("ts", &pif, NULL); }