Bring QoS operations naming scheme in line with the rest

The main naming scheme is OPER_TYPE (i.e., dds_create_participant) but the QoS operations were named TYPE_OPER (i.e., dds_qos_create). This commit brings the QoS scheme in line with the rest, retaining the old names as a deprecated interface.

Signed-off-by: Erik Boasson <eb@ilities.com>

src/core/ddsc/include/ddsc/dds_public_qos.h

@@ -144,6 +144,9 @@ dds_presentation_access_scope_kind_t;
  */
 _Ret_notnull_
 DDS_EXPORT
+dds_qos_t * dds_create_qos (void);
+_Ret_notnull_
+DDS_DEPRECATED_EXPORT
 dds_qos_t * dds_qos_create (void);
 
 /**
@@ -152,6 +155,10 @@ dds_qos_t * dds_qos_create (void);
  * @param[in] qos - Pointer to dds_qos_t structure
  */
 DDS_EXPORT
+void dds_delete_qos (
+    _In_ _Post_invalid_ dds_qos_t * __restrict qos
+);
+DDS_DEPRECATED_EXPORT
 void dds_qos_delete (
     _In_ _Post_invalid_ dds_qos_t * __restrict qos
 );
@@ -161,7 +168,10 @@ void dds_qos_delete (
  *
  * @param[in,out] qos - Pointer to the dds_qos_t structure
  */
-DDS_EXPORT
+DDS_EXPORT void
+dds_reset_qos(
+    _Out_ dds_qos_t * __restrict qos);
+DDS_DEPRECATED_EXPORT
 void dds_qos_reset (
     _Out_ dds_qos_t * __restrict qos
 );
@@ -175,6 +185,11 @@ void dds_qos_reset (
  * @returns - Return-code indicating success or failure
  */
 DDS_EXPORT
+dds_return_t dds_copy_qos (
+    _Out_ dds_qos_t * __restrict dst,
+    _In_ const dds_qos_t * __restrict src
+);
+DDS_DEPRECATED_EXPORT
 dds_return_t dds_qos_copy (
     _Out_ dds_qos_t * __restrict dst,
     _In_ const dds_qos_t * __restrict src
@@ -189,6 +204,12 @@ dds_return_t dds_qos_copy (
  * @param[in] src - Pointer to the source qos structure
  */
 DDS_EXPORT
+void dds_merge_qos
+(
+    _Inout_ dds_qos_t * __restrict dst,
+    _In_ const dds_qos_t * __restrict src
+);
+DDS_DEPRECATED_EXPORT
 void dds_qos_merge
 (
     _Inout_ dds_qos_t * __restrict dst,

src/core/ddsc/src/dds_builtin.c

@@ -152,12 +152,12 @@ dds__create_builtin_publisher(
     dds_qos_t *qos;
     const char *partition = "__BUILT-IN PARTITION__";
 
-    qos = dds_qos_create();
+    qos = dds_create_qos();
     dds_qset_partition(qos, 1, &partition);
 
     pub = dds_create_publisher(participant, qos, NULL);
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 
     return pub;
 }
@@ -170,12 +170,12 @@ dds__create_builtin_subscriber(
     dds_qos_t *qos;
     const char *partition = "__BUILT-IN PARTITION__";
 
-    qos = dds_qos_create();
+    qos = dds_create_qos();
     dds_qset_partition(qos, 1, &partition);
 
     /* Create builtin-subscriber */
     sub = dds__create_subscriber_l(participant, qos, NULL);
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 
     return sub;
 }
@@ -191,11 +191,11 @@ dds__create_builtin_writer(
         if (top > 0) {
             dds_qos_t *qos;
             // TODO: set builtin qos
-            qos = dds_qos_create();
+            qos = dds_create_qos();
             dds_qset_durability(qos, DDS_DURABILITY_TRANSIENT_LOCAL);
             dds_qset_reliability(qos, DDS_RELIABILITY_RELIABLE, DDS_MSECS(100));
             wr = dds_create_writer(pub, top, qos, NULL);
-            dds_qos_delete(qos);
+            dds_delete_qos(qos);
             (void)dds_delete(top);
         } else {
             wr = top;
@@ -323,12 +323,12 @@ dds__get_builtin_topic(
             DDS_REPORT_FLUSH(0);
             DDS_REPORT_STACK();
 
-            tqos = dds_qos_create();
+            tqos = dds_create_qos();
             dds_qset_durability(tqos, DDS_DURABILITY_TRANSIENT_LOCAL);
             dds_qset_presentation(tqos, DDS_PRESENTATION_TOPIC, false, false);
             dds_qset_reliability(tqos, DDS_RELIABILITY_RELIABLE, DDS_MSECS(100));
             ret = dds_create_topic(participant, desc, name, tqos, NULL);
-            dds_qos_delete(tqos);
+            dds_delete_qos(tqos);
         }
 
     } else {

src/core/ddsc/src/dds_entity.c

@@ -432,7 +432,7 @@ dds_delete_impl(
 
     if (ret == DDS_RETCODE_OK) {
         /* Destroy last few things. */
-        dds_qos_delete (e->m_qos);
+        dds_delete_qos (e->m_qos);
         os_condDestroy (&e->m_cond);
         os_mutexDestroy (&e->m_mutex);
         os_mutexDestroy (&e->m_observers_lock);
@@ -573,7 +573,7 @@ dds_get_qos(
         goto fail;
     }
     if (e->m_deriver.set_qos) {
-        rc = dds_qos_copy(qos, e->m_qos);
+        rc = dds_copy_qos(qos, e->m_qos);
     } else {
         rc = DDS_RETCODE_ILLEGAL_OPERATION;
         ret = DDS_ERRNO(rc, "QoS cannot be set on this entity");
@@ -609,9 +609,9 @@ dds_set_qos(
             if (ret == DDS_RETCODE_OK) {
                 /* Remember this QoS. */
                 if (e->m_qos == NULL) {
-                    e->m_qos = dds_qos_create();
+                    e->m_qos = dds_create_qos();
                 }
-                rc = dds_qos_copy(e->m_qos, qos);
+                rc = dds_copy_qos(e->m_qos, qos);
                 ret = DDS_ERRNO(rc, "QoS cannot be set on this entity");
             }
             dds_entity_unlock(e);

src/core/ddsc/src/dds_participant.c

@@ -170,18 +170,18 @@ dds_create_participant(
             e = (dds_entity_t)ret;
             goto fail_qos_validation;
         }
-        new_qos = dds_qos_create ();
+        new_qos = dds_create_qos ();
         /* Only returns failure when one of the qos args is NULL, which
          * is not the case here. */
-        (void)dds_qos_copy(new_qos, qos);
+        (void)dds_copy_qos(new_qos, qos);
     } else {
         /* Use default qos. */
-        new_qos = dds_qos_create ();
+        new_qos = dds_create_qos ();
     }
 
     /* Translate qos */
     nn_plist_init_empty(&plist);
-    dds_qos_merge (&plist.qos, new_qos);
+    dds_merge_qos (&plist.qos, new_qos);
 
     thr = lookup_thread_state ();
     asleep = !vtime_awake_p (thr->vtime);
@@ -225,7 +225,7 @@ dds_create_participant(
 fail_entity_init:
     dds_free(pp);
 fail_new_participant:
-    dds_qos_delete(new_qos);
+    dds_delete_qos(new_qos);
 fail_qos_validation:
 fail_domain_check:
     DDS_REPORT_FLUSH(true);

src/core/ddsc/src/dds_publisher.c

@@ -112,10 +112,10 @@ dds_create_publisher(
             hdl = ret;
             goto qos_err;
         }
-        new_qos = dds_qos_create ();
+        new_qos = dds_create_qos ();
         /* Only returns failure when one of the qos args is NULL, which
          * is not the case here. */
-        (void)dds_qos_copy(new_qos, qos);
+        (void)dds_copy_qos(new_qos, qos);
     }
 
     /* Create publisher */

src/core/ddsc/src/dds_qos.c

@@ -194,15 +194,21 @@ dds_qos_init_defaults (
 }
 
 _Ret_notnull_
-dds_qos_t * dds_qos_create (void)
+dds_qos_t * dds_create_qos (void)
 {
     dds_qos_t *qos = dds_alloc (sizeof (dds_qos_t));
     dds_qos_init_defaults (qos);
     return qos;
 }
 
+_Ret_notnull_
+dds_qos_t * dds_qos_create (void)
+{
+    return dds_create_qos ();
+}
+
 void
-dds_qos_reset(
+dds_reset_qos(
     _Out_ dds_qos_t * __restrict qos)
 {
     if (qos) {
@@ -214,17 +220,31 @@ dds_qos_reset(
 }
 
 void
-dds_qos_delete(
+dds_qos_reset(
+    _Out_ dds_qos_t * __restrict qos)
+{
+    dds_reset_qos (qos);
+}
+
+void
+dds_delete_qos(
     _In_ _Post_invalid_ dds_qos_t * __restrict qos)
 {
     if (qos) {
-        dds_qos_reset(qos);
+        dds_reset_qos(qos);
         dds_free(qos);
     }
 }
 
+void
+dds_qos_delete(
+    _In_ _Post_invalid_ dds_qos_t * __restrict qos)
+{
+    dds_delete_qos (qos);
+}
+
 dds_return_t
-dds_qos_copy (
+dds_copy_qos (
     _Out_ dds_qos_t * __restrict dst,
     _In_ const dds_qos_t * __restrict src)
 {
@@ -238,7 +258,15 @@ dds_qos_copy (
     return DDS_RETCODE_OK;
 }
 
-void dds_qos_merge (
+dds_return_t
+dds_qos_copy (
+    _Out_ dds_qos_t * __restrict dst,
+    _In_ const dds_qos_t * __restrict src)
+{
+    return dds_copy_qos (dst, src);
+}
+
+void dds_merge_qos (
     _Inout_ dds_qos_t * __restrict dst,
     _In_ const dds_qos_t * __restrict src)
 {
@@ -254,6 +282,13 @@ void dds_qos_merge (
     nn_xqos_mergein_missing (dst, src);
 }
 
+void dds_qos_merge (
+    _Inout_ dds_qos_t * __restrict dst,
+    _In_ const dds_qos_t * __restrict src)
+{
+    dds_merge_qos (dst, src);
+}
+
 bool dds_qos_equal (
     _In_opt_ const dds_qos_t * __restrict a,
     _In_opt_ const dds_qos_t * __restrict b)

src/core/ddsc/src/dds_reader.c

@@ -399,19 +399,19 @@ dds_create_reader(
     assert (sub->m_domain == tp->m_domain);
 
     /* Merge qos from topic and subscriber */
-    rqos = dds_qos_create ();
+    rqos = dds_create_qos ();
     if (qos) {
         /* Only returns failure when one of the qos args is NULL, which
          * is not the case here. */
-        (void)dds_qos_copy(rqos, qos);
+        (void)dds_copy_qos(rqos, qos);
     }
 
     if(sub->m_qos){
-        dds_qos_merge (rqos, sub->m_qos);
+        dds_merge_qos (rqos, sub->m_qos);
     }
 
     if (tp->m_qos) {
-        dds_qos_merge (rqos, tp->m_qos);
+        dds_merge_qos (rqos, tp->m_qos);
 
         /* reset the following qos policies if set during topic qos merge as they aren't applicable for reader */
         rqos->present &= ~(QP_DURABILITY_SERVICE | QP_TRANSPORT_PRIORITY | QP_LIFESPAN);
@@ -420,7 +420,7 @@ dds_create_reader(
 
     ret = dds_reader_qos_validate (rqos, false);
     if (ret != 0) {
-        dds_qos_delete(rqos);
+        dds_delete_qos(rqos);
         reader = ret;
         goto err_bad_qos;
     }

src/core/ddsc/src/dds_subscriber.c

@@ -125,10 +125,10 @@ dds__create_subscriber_l(
         if ((ret = dds__subscriber_qos_validate(qos, false)) != DDS_RETCODE_OK) {
             goto err_param;
         }
-        new_qos = dds_qos_create();
+        new_qos = dds_create_qos();
         /* Only returns failure when one of the qos args is NULL, which
          * is not the case here. */
-        (void)dds_qos_copy(new_qos, qos);
+        (void)dds_copy_qos(new_qos, qos);
     } else {
         new_qos = NULL;
     }

src/core/ddsc/src/dds_topic.c

@@ -398,10 +398,10 @@ dds_create_topic(
         strcat (key, typename);
 
         if (qos) {
-            new_qos = dds_qos_create();
+            new_qos = dds_create_qos();
             /* Only returns failure when one of the qos args is NULL, which
              * is not the case here. */
-            (void)dds_qos_copy(new_qos, qos);
+            (void)dds_copy_qos(new_qos, qos);
         }
 
         /* Create topic */
@@ -445,7 +445,7 @@ dds_create_topic(
 
         nn_plist_init_empty (&plist);
         if (new_qos) {
-            dds_qos_merge (&plist.qos, new_qos);
+            dds_merge_qos (&plist.qos, new_qos);
         }
 
         /* Set Topic meta data (for SEDP publication) */

src/core/ddsc/src/dds_writer.c

@@ -448,26 +448,26 @@ dds_create_writer(
     assert(pub->m_domain == tp->m_domain);
 
     /* Merge Topic & Publisher qos */
-    wqos = dds_qos_create();
+    wqos = dds_create_qos();
     if (qos) {
         /* Only returns failure when one of the qos args is NULL, which
          * is not the case here. */
-        (void)dds_qos_copy(wqos, qos);
+        (void)dds_copy_qos(wqos, qos);
     }
 
     if (pub->m_qos) {
-        dds_qos_merge(wqos, pub->m_qos);
+        dds_merge_qos(wqos, pub->m_qos);
     }
 
     if (tp->m_qos) {
         /* merge topic qos data to writer qos */
-        dds_qos_merge(wqos, tp->m_qos);
+        dds_merge_qos(wqos, tp->m_qos);
     }
     nn_xqos_mergein_missing(wqos, &gv.default_xqos_wr);
 
     ret = dds_writer_qos_validate(wqos, false);
     if (ret != 0) {
-        dds_qos_delete(wqos);
+        dds_delete_qos(wqos);
         writer = ret;
         goto err_bad_qos;
     }

src/core/ddsc/tests/builtin_topics.c

@@ -58,7 +58,7 @@ static dds_qos_t *g_qos = NULL;
 static void
 qos_init(void)
 {
-    g_qos = dds_qos_create();
+    g_qos = dds_create_qos();
     cr_assert_not_null(g_qos);
 
     g_pol_userdata.value._buffer = dds_alloc(strlen(c_userdata) + 1);
@@ -137,7 +137,7 @@ qos_init(void)
 static void
 qos_fini(void)
 {
-    dds_qos_delete(g_qos);
+    dds_delete_qos(g_qos);
     dds_free(g_pol_userdata.value._buffer);
     dds_free(g_pol_groupdata.value._buffer);
     dds_free(g_pol_topicdata.value._buffer);
@@ -196,7 +196,7 @@ check_default_qos_of_builtin_entity(dds_entity_t entity)
   char **partitions;
   uint32_t plen;
 
-  dds_qos_t *qos = dds_qos_create();
+  dds_qos_t *qos = dds_create_qos();
   cr_assert_not_null(qos);
 
   ret = dds_get_qos(entity, qos);
@@ -249,7 +249,7 @@ check_default_qos_of_builtin_entity(dds_entity_t entity)
       }
       dds_free(partitions);
   }
-  dds_qos_delete(qos);
+  dds_delete_qos(qos);
 }
 
 static dds_entity_t builtin_topic_handles[10];

src/core/ddsc/tests/dispose.c

@@ -62,7 +62,7 @@ static void
 disposing_init(void)
 {
     Space_Type1 sample = { 0, 0, 0 };
-    dds_qos_t *qos = dds_qos_create ();
+    dds_qos_t *qos = dds_create_qos ();
     dds_attach_t triggered;
     dds_return_t ret;
     char name[100];
@@ -132,7 +132,7 @@ disposing_init(void)
     g_present = dds_time();
     g_past    = g_present - DDS_SECS(1);
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 static void

src/core/ddsc/tests/entity_api.c

@@ -72,7 +72,7 @@ Test(ddsc_entity, enable, .init = create_entity, .fini = delete_entity)
 void entity_qos_get_set(dds_entity_t e, const char* info)
 {
     dds_return_t status;
-    dds_qos_t *qos = dds_qos_create();
+    dds_qos_t *qos = dds_create_qos();
 
     /* Get QoS. */
     status = dds_get_qos (e, qos);
@@ -81,13 +81,13 @@ void entity_qos_get_set(dds_entity_t e, const char* info)
     status = dds_set_qos (e, qos); /* Doesn't change anything, so no need to forbid. But we return NOT_SUPPORTED anyway for now*/
     cr_assert_status_eq(status, DDS_RETCODE_UNSUPPORTED, "dds_set_qos(entity, qos) %s", info);
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 Test(ddsc_entity, qos, .init = create_entity, .fini = delete_entity)
 {
     dds_return_t status;
-    dds_qos_t *qos = dds_qos_create();
+    dds_qos_t *qos = dds_create_qos();
 
     /* Don't check inconsistent and immutable policies. That's a job
      * for the specific entity children, not for the generic part. */
@@ -119,7 +119,7 @@ Test(ddsc_entity, qos, .init = create_entity, .fini = delete_entity)
     }
 
     /* Delete qos. */
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 Test(ddsc_entity, listener, .init = create_entity, .fini = delete_entity)

src/core/ddsc/tests/entity_status.c

@@ -71,7 +71,7 @@ init_entity_status(void)
     top = dds_create_topic(participant, &RoundTripModule_DataType_desc, create_topic_name("ddsc_status_test", topicName, 100), NULL, NULL);
     cr_assert_gt(top, 0, "Failed to create prerequisite topic");
 
-    qos = dds_qos_create();
+    qos = dds_create_qos();
     cr_assert_not_null(qos, "Failed to create prerequisite qos");
     dds_qset_resource_limits (qos, resource_limits.max_samples, resource_limits.max_instances, resource_limits.max_samples_per_instance);
     dds_qset_reliability(qos, DDS_RELIABILITY_BEST_EFFORT, DDS_MSECS(100));
@@ -113,7 +113,7 @@ fini_entity_status(void)
     dds_delete(wri);
     dds_delete(publisher);
     dds_delete(rea);
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
     dds_delete(top);
     dds_delete(subscriber);
     dds_delete(participant);

src/core/ddsc/tests/listener.c

@@ -344,7 +344,7 @@ init_triggering_base(void)
     g_listener = dds_listener_create(NULL);
     cr_assert_not_null(g_listener, "Failed to create prerequisite g_listener");
 
-    g_qos = dds_qos_create();
+    g_qos = dds_create_qos();
     cr_assert_not_null(g_qos, "Failed to create prerequisite g_qos");
     dds_qset_reliability(g_qos, DDS_RELIABILITY_RELIABLE, DDS_SECS(1));
     dds_qset_history(g_qos, DDS_HISTORY_KEEP_ALL, 0);
@@ -384,7 +384,7 @@ init_triggering_test(void)
 static void
 fini_triggering_base(void)
 {
-    dds_qos_delete(g_qos);
+    dds_delete_qos(g_qos);
     dds_listener_delete(g_listener);
     dds_delete(g_participant);
     os_condDestroy(&g_cond);
@@ -1019,7 +1019,7 @@ Test(ddsc_listener, inconsistent_topic, .init=init_triggering_base, .fini=fini_t
     os_mutexInit(&g_mutex);
     os_condInit(&g_cond, &g_mutex);
 
-    g_qos = dds_qos_create();
+    g_qos = dds_create_qos();
     cr_assert_not_null(g_qos, "Failed to create prerequisite g_qos");
 
     g_listener = dds_listener_create(NULL);
@@ -1056,7 +1056,7 @@ Test(ddsc_listener, inconsistent_topic, .init=init_triggering_base, .fini=fini_t
     dds_delete(g_participant);
 
     dds_listener_delete(g_listener);
-    dds_qos_delete(g_qos);
+    dds_delete_qos(g_qos);
 }
 #endif
 #endif

src/core/ddsc/tests/publisher.c

@@ -58,8 +58,8 @@ Test(ddsc_publisher, create)
   dds_delete(publisher);
 
   /* Create a non-null qos */
-  qos = dds_qos_create();
-  cr_assert_neq(qos, NULL, "dds_qos_create()");
+  qos = dds_create_qos();
+  cr_assert_neq(qos, NULL, "dds_create_qos()");
 
   /* Use qos without partition; in that case the default partition should be used */
   publisher = dds_create_publisher(participant, qos, NULL);
@@ -132,7 +132,7 @@ Test(ddsc_publisher, create)
   dds_delete(publisher);
 
   dds_listener_delete(listener);
-  dds_qos_delete(qos);
+  dds_delete_qos(qos);
   dds_delete (participant);
 }
 

src/core/ddsc/tests/qos.c

@@ -168,7 +168,7 @@ static dds_qos_t *g_qos = NULL;
 static void
 qos_init(void)
 {
-    g_qos = dds_qos_create();
+    g_qos = dds_create_qos();
     cr_assert_not_null(g_qos);
 
     g_pol_userdata.value = (void*)c_userdata;
@@ -234,7 +234,7 @@ qos_init(void)
 static void
 qos_fini(void)
 {
-    dds_qos_delete(g_qos);
+    dds_delete_qos(g_qos);
 }
 
 /****************************************************************************

src/core/ddsc/tests/querycondition.c

@@ -90,7 +90,7 @@ static void
 querycondition_init(void)
 {
     Space_Type1 sample = { 0, 0, 0 };
-    dds_qos_t *qos = dds_qos_create ();
+    dds_qos_t *qos = dds_create_qos ();
     dds_attach_t triggered;
     dds_return_t ret;
     char name[100];
@@ -198,7 +198,7 @@ querycondition_init(void)
         }
     }
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 static void

src/core/ddsc/tests/read_instance.c

@@ -94,7 +94,7 @@ read_instance_init(void)
     char name[100];
     dds_qos_t *qos;
 
-    qos = dds_qos_create();
+    qos = dds_create_qos();
     cr_assert_not_null(qos, "Failed to create prerequisite qos");
 
     g_participant = dds_create_participant(DDS_DOMAIN_DEFAULT, NULL, NULL);
@@ -256,7 +256,7 @@ read_instance_init(void)
     g_hdl_valid = dds_instance_lookup(g_reader, &sample);
     cr_assert_neq(g_hdl_valid, DDS_HANDLE_NIL, "Failed prerequisite dds_instance_lookup");
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 static void

src/core/ddsc/tests/readcondition.c

@@ -83,7 +83,7 @@ static void
 readcondition_init(void)
 {
     Space_Type1 sample = { 0, 0, 0 };
-    dds_qos_t *qos = dds_qos_create ();
+    dds_qos_t *qos = dds_create_qos ();
     dds_attach_t triggered;
     dds_return_t ret;
     char name[100];
@@ -191,7 +191,7 @@ readcondition_init(void)
         }
     }
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 static void

src/core/ddsc/tests/reader.c

@@ -89,7 +89,7 @@ reader_init(void)
     dds_return_t ret;
     char name[100];
 
-    g_qos = dds_qos_create();
+    g_qos = dds_create_qos();
     g_listener = dds_listener_create(NULL);
 
     g_participant = dds_create_participant(DDS_DOMAIN_DEFAULT, NULL, NULL);
@@ -205,7 +205,7 @@ reader_init(void)
 static void
 reader_fini(void)
 {
-    dds_qos_delete(g_qos);
+    dds_delete_qos(g_qos);
     dds_listener_delete(g_listener);
     dds_delete(g_reader);
     dds_delete(g_writer);
@@ -249,14 +249,14 @@ Theory((dds_entity_t *ent, dds_qos_t **qos, dds_listener_t **listener), ddsc_rea
 Test(ddsc_reader_create, invalid_qos_participant, .init=reader_init, .fini=reader_fini)
 {
     dds_entity_t rdr;
-    dds_qos_t *qos = dds_qos_create();
+    dds_qos_t *qos = dds_create_qos();
     /* Set invalid reader data lifecycle policy */
     OS_WARNING_MSVC_OFF(28020); /* Disable SAL warning on intentional misuse of the API */
     dds_qset_reader_data_lifecycle(qos, DDS_SECS(-1), DDS_SECS(-1));
     OS_WARNING_MSVC_ON(28020);
     rdr = dds_create_reader(g_participant, g_topic, qos, NULL);
     cr_assert_eq(dds_err_nr(rdr), DDS_RETCODE_INCONSISTENT_POLICY, "returned %d", dds_err_nr(rdr));
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 /*************************************************************************************************/
 
@@ -264,14 +264,14 @@ Test(ddsc_reader_create, invalid_qos_participant, .init=reader_init, .fini=reade
 Test(ddsc_reader_create, invalid_qos_subscriber, .init=reader_init, .fini=reader_fini)
 {
     dds_entity_t rdr;
-    dds_qos_t *qos = dds_qos_create();
+    dds_qos_t *qos = dds_create_qos();
     /* Set invalid reader data lifecycle policy */
     OS_WARNING_MSVC_OFF(28020); /* Disable SAL warning on intentional misuse of the API */
     dds_qset_reader_data_lifecycle(qos, DDS_SECS(-1), DDS_SECS(-1));
     OS_WARNING_MSVC_ON(28020);
     rdr = dds_create_reader(g_subscriber, g_topic, qos, NULL);
     cr_assert_eq(dds_err_nr(rdr), DDS_RETCODE_INCONSISTENT_POLICY, "returned %d", dds_err_nr(rdr));
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 /*************************************************************************************************/
 
@@ -2506,7 +2506,7 @@ Test(ddsc_take_mask, take_instance_last_sample)
     char name[100];
 
     /* We need other readers/writers/data to force the crash. */
-    g_qos = dds_qos_create();
+    g_qos = dds_create_qos();
     dds_qset_history(g_qos, DDS_HISTORY_KEEP_ALL, DDS_LENGTH_UNLIMITED);
     g_participant = dds_create_participant(DDS_DOMAIN_DEFAULT, NULL, NULL);
     cr_assert_gt(g_participant, 0, "Failed to create prerequisite g_participant");
@@ -2606,7 +2606,7 @@ Test(ddsc_take_mask, take_instance_last_sample)
     dds_delete(g_waitset);
     dds_delete(g_topic);
     dds_delete(g_participant);
-    dds_qos_delete(g_qos);
+    dds_delete_qos(g_qos);
 }
 /*************************************************************************************************/
 

src/core/ddsc/tests/reader_iterator.c

@@ -131,7 +131,7 @@ reader_iterator_init(void)
     char name[100];
     dds_qos_t *qos;
 
-    qos = dds_qos_create();
+    qos = dds_create_qos();
     cr_assert_not_null(qos, "Failed to create prerequisite qos");
 
     g_participant = dds_create_participant(DDS_DOMAIN_DEFAULT, NULL, NULL);
@@ -308,7 +308,7 @@ reader_iterator_init(void)
      *    |    6   |   20   |   40   |     read | old | no_writers |
      */
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 static void

src/core/ddsc/tests/register.c

@@ -54,7 +54,7 @@ static void
 registering_init(void)
 {
     Space_Type1 sample = { 0, 0, 0 };
-    dds_qos_t *qos = dds_qos_create ();
+    dds_qos_t *qos = dds_create_qos ();
     dds_attach_t triggered;
     dds_return_t ret;
     char name[100];
@@ -123,7 +123,7 @@ registering_init(void)
     g_present = dds_time();
     g_past    = g_present - DDS_SECS(1);
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 static void

src/core/ddsc/tests/subscriber.c

@@ -76,24 +76,24 @@ Test(ddsc_subscriber, create) {
 
   /*** Verify qos parameter ***/
 
-  sqos = dds_qos_create(); /* Use defaults (no user-defined policies) */
+  sqos = dds_create_qos(); /* Use defaults (no user-defined policies) */
   subscriber = dds_create_subscriber(participant, sqos, NULL);
   cr_assert_gt(subscriber, 0, "dds_create_subscriber: default QoS parameter");
   dds_delete(subscriber);
-  dds_qos_delete(sqos);
+  dds_delete_qos(sqos);
 
-  sqos = dds_qos_create();
+  sqos = dds_create_qos();
   dds_qset_destination_order(sqos, 3); /* Set invalid dest. order (ignored, not applicable for subscriber) */
   subscriber = dds_create_subscriber(participant, sqos, NULL);
   cr_assert_gt(subscriber, 0, "dds_create_subscriber: invalid non-applicable QoS parameter");
   dds_delete(subscriber);
-  dds_qos_delete(sqos);
+  dds_delete_qos(sqos);
 
-  sqos = dds_qos_create();
+  sqos = dds_create_qos();
   dds_qset_presentation(sqos, 123, 1, 1); /* Set invalid presentation policy */
   subscriber = dds_create_subscriber(participant, sqos, NULL);
   cr_assert_eq(dds_err_nr(subscriber), DDS_RETCODE_INCONSISTENT_POLICY, "dds_create_subscriber: invalid presentation access_scope QoS parameter");
-  dds_qos_delete(sqos);
+  dds_delete_qos(sqos);
 
   /*** Verify listener parameter ***/
 

src/core/ddsc/tests/take_instance.c

@@ -94,7 +94,7 @@ take_instance_init(void)
     char name[100];
     dds_qos_t *qos;
 
-    qos = dds_qos_create();
+    qos = dds_create_qos();
     cr_assert_not_null(qos, "Failed to create prerequisite qos");
 
     g_participant = dds_create_participant(DDS_DOMAIN_DEFAULT, NULL, NULL);
@@ -256,7 +256,7 @@ take_instance_init(void)
     g_hdl_valid = dds_instance_lookup(g_reader, &sample);
     cr_assert_neq(g_hdl_valid, DDS_HANDLE_NIL, "Failed prerequisite dds_instance_lookup");
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 static void

src/core/ddsc/tests/topic.c

@@ -60,7 +60,7 @@ ddsc_topic_init(void)
     g_topicRtmDataType = dds_create_topic(g_participant, &RoundTripModule_DataType_desc, g_topicRtmDataTypeName, NULL, NULL);
     cr_assert_gt(g_topicRtmDataType, 0, "Failed to create prerequisite g_topicRtmDataType");
 
-    g_qos = dds_qos_create();
+    g_qos = dds_create_qos();
     g_listener = dds_listener_create(NULL);
 }
 
@@ -68,7 +68,7 @@ ddsc_topic_init(void)
 static void
 ddsc_topic_fini(void)
 {
-    dds_qos_delete(g_qos);
+    dds_delete_qos(g_qos);
     dds_listener_delete(g_listener);
     dds_delete(g_topicRtmDataType);
     dds_delete(g_topicRtmAddress);
@@ -102,13 +102,13 @@ Theory((char *name, dds_qos_t **qos, dds_listener_t **listener), ddsc_topic_crea
 Test(ddsc_topic_create, invalid_qos, .init=ddsc_topic_init, .fini=ddsc_topic_fini)
 {
     dds_entity_t topic;
-    dds_qos_t *qos = dds_qos_create();
+    dds_qos_t *qos = dds_create_qos();
     OS_WARNING_MSVC_OFF(28020); /* Disable SAL warning on intentional misuse of the API */
     dds_qset_lifespan(qos, DDS_SECS(-1));
     OS_WARNING_MSVC_OFF(28020);
     topic = dds_create_topic(g_participant, &RoundTripModule_DataType_desc, "inconsistent", qos, NULL);
     cr_assert_eq(dds_err_nr(topic), DDS_RETCODE_INCONSISTENT_POLICY, "returned %s", dds_err_str(topic));
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 /*************************************************************************************************/
 

src/core/ddsc/tests/transientlocal.c

@@ -39,7 +39,7 @@ Test(ddsc_transient_local, late_joiner)
     }
 
     /* Use transient local with reliable. */
-    qos = dds_qos_create();
+    qos = dds_create_qos();
     dds_qset_durability(qos, DDS_DURABILITY_TRANSIENT_LOCAL);
     dds_qset_reliability(qos, DDS_RELIABILITY_RELIABLE, DDS_INFINITY);
 
@@ -101,5 +101,5 @@ Test(ddsc_transient_local, late_joiner)
     cr_assert_eq(ret, 4, "# read %d, expected 4", ret);
 
     dds_delete(par);
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }

src/core/ddsc/tests/unregister.c

@@ -54,7 +54,7 @@ static void
 unregistering_init(void)
 {
     Space_Type1 sample = { 0, 0, 0 };
-    dds_qos_t *qos = dds_qos_create ();
+    dds_qos_t *qos = dds_create_qos ();
     dds_attach_t triggered;
     dds_return_t ret;
     char name[100];
@@ -123,7 +123,7 @@ unregistering_init(void)
     g_present = dds_time();
     g_past    = g_present - DDS_SECS(1);
 
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }
 
 static void

src/core/ddsc/tests/unsupported.c

@@ -175,8 +175,8 @@ ParameterizedTest(struct index_result *par, ddsc_unsupported, dds_set_qos, .init
     dds_return_t result;
     dds_qos_t *qos;
 
-    qos = dds_qos_create();
+    qos = dds_create_qos();
     result = dds_set_qos(e[par->index], qos);
     cr_expect_eq(dds_err_nr(result), par->exp_res, "Unexpected return code %d \"%s\" (expected %d \"%s\") from dds_set_qos(%s, qos): (%d)", dds_err_nr(result), dds_err_str(result), par->exp_res, dds_err_str(-par->exp_res), entity_kind_str(e[par->index]), result);
-    dds_qos_delete(qos);
+    dds_delete_qos(qos);
 }