From e11f88017da959e7ed5a2481819b93b2376f3f5b Mon Sep 17 00:00:00 2001
From: Jure Varlec <jure.varlec@cosylab.com>
Date: Tue, 18 Oct 2022 17:05:05 +0200
Subject: [PATCH] ts filter: port to the new db_field_log

---
 modules/database/src/std/filters/ts.c      | 20 ++++++++++----------
 modules/database/test/std/filters/tsTest.c |  6 +++---
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/modules/database/src/std/filters/ts.c b/modules/database/src/std/filters/ts.c
index 3c2eea2fd..056b23d8b 100644
--- a/modules/database/src/std/filters/ts.c
+++ b/modules/database/src/std/filters/ts.c
@@ -167,9 +167,9 @@ static db_field_log *replace_fl_value(tsPrivate const *pvt,
                                       int (*func)(tsPrivate const *,
                                                   db_field_log *)) {
     /* Get rid of the old value */
-    if (pfl->type == dbfl_type_ref && pfl->u.r.dtor) {
-        pfl->u.r.dtor(pfl);
-        pfl->u.r.dtor = NULL;
+    if (pfl->type == dbfl_type_ref && pfl->dtor) {
+        pfl->dtor(pfl);
+        pfl->dtor = NULL;
     }
     pfl->no_elements = 1;
     pfl->type = dbfl_type_val;
@@ -228,11 +228,11 @@ static int ts_array(tsPrivate const *settings, db_field_log *pfl) {
     pfl->u.r.field = allocTsArray();
     if (pfl->u.r.field) {
         pfl->no_elements = 2;
-        pfl->u.r.dtor = freeTsArray;
+        pfl->dtor = freeTsArray;
         ts_to_array(settings, &pfl->time, (epicsUInt32*)pfl->u.r.field);
     } else {
         pfl->no_elements = 0;
-        pfl->u.r.dtor = NULL;
+        pfl->dtor = NULL;
     }
     return 0;
 }
@@ -263,11 +263,11 @@ static int ts_string(tsPrivate const *settings, db_field_log *pfl) {
 
     if (!pfl->u.r.field) {
         pfl->no_elements = 0;
-        pfl->u.r.dtor = NULL;
+        pfl->dtor = NULL;
         return 0;
     }
 
-    pfl->u.r.dtor = freeString;
+    pfl->dtor = freeString;
 
     field = (char *)pfl->u.r.field;
     n = epicsTimeToStrftime(field, MAX_STRING_SIZE, fmt, &pfl->time);
@@ -336,9 +336,9 @@ static void channelRegisterPost(dbChannel *chan, void *pvt,
 
     /* Get rid of the value of the probe because we will be changing the
        datatype */
-    if (probe->type == dbfl_type_ref && probe->u.r.dtor) {
-        probe->u.r.dtor(probe);
-        probe->u.r.dtor = NULL;
+    if (probe->type == dbfl_type_ref && probe->dtor) {
+        probe->dtor(probe);
+        probe->dtor = NULL;
     }
     probe->no_elements = 1;
     probe->type = dbfl_type_val;
diff --git a/modules/database/test/std/filters/tsTest.c b/modules/database/test/std/filters/tsTest.c
index 67d42ebba..9f4036330 100644
--- a/modules/database/test/std/filters/tsTest.c
+++ b/modules/database/test/std/filters/tsTest.c
@@ -207,7 +207,7 @@ static int value_check_array(const db_field_log *pfl, const epicsTimeStamp *ts)
     epicsUInt32 *arr = (epicsUInt32*)pfl->u.r.field;
     return pfl->type == dbfl_type_ref
         && pfl->u.r.field != NULL
-        && pfl->u.r.dtor != NULL
+        && pfl->dtor != NULL
         && pfl->u.r.pvt == NULL
         && ts->secPastEpoch == arr[0]
         && ts->nsec == arr[1];
@@ -217,7 +217,7 @@ static int value_check_unix(const db_field_log *pfl, const epicsTimeStamp *ts) {
     epicsUInt32 *arr = (epicsUInt32 *)pfl->u.r.field;
     return pfl->type == dbfl_type_ref
         && pfl->u.r.field != NULL
-        && pfl->u.r.dtor != NULL
+        && pfl->dtor != NULL
         && pfl->u.r.pvt == NULL
         && ts->secPastEpoch == arr[0] - POSIX_TIME_AT_EPICS_EPOCH
         && ts->nsec == arr[1];
@@ -235,7 +235,7 @@ static int value_check_string(const db_field_log *pfl, const epicsTimeStamp *ts)
     (void)ts;
     return pfl->type == dbfl_type_ref
         && pfl->u.r.field != NULL
-        && pfl->u.r.dtor != NULL
+        && pfl->dtor != NULL
         && pfl->u.r.pvt == NULL;
 }