Align naming of MonitoredItem functions to the usual style

src/server/ua_server.c

@@ -113,7 +113,7 @@ void UA_Server_delete(UA_Server *server) {
     UA_MonitoredItem *mon, *mon_tmp;
     LIST_FOREACH_SAFE(mon, &server->localMonitoredItems, listEntry, mon_tmp) {
         LIST_REMOVE(mon, listEntry);
-        MonitoredItem_delete(server, mon);
+        UA_MonitoredItem_delete(server, mon);
     }
 #endif
 

src/server/ua_services_subscription.c

@@ -183,7 +183,7 @@ setMonitoredItemSettings(UA_Server *server, UA_MonitoredItem *mon,
         UA_DataChangeFilter_copy(filter, &(mon->filter));
     }
 
-    MonitoredItem_unregisterSampleCallback(server, mon);
+    UA_MonitoredItem_unregisterSampleCallback(server, mon);
     mon->monitoringMode = monitoringMode;
 
     /* ClientHandle */
@@ -210,7 +210,6 @@ setMonitoredItemSettings(UA_Server *server, UA_MonitoredItem *mon,
     if(samplingInterval != samplingInterval) /* Check for nan */
         mon->samplingInterval = server->config.samplingIntervalLimits.min;
 
-
     /* QueueSize */
     UA_BOUNDEDVALUE_SETWBOUNDS(server->config.queueSizeLimits,
                                params->queueSize, mon->maxQueueSize);
@@ -220,7 +219,7 @@ setMonitoredItemSettings(UA_Server *server, UA_MonitoredItem *mon,
 
     /* Register sample callback if reporting is enabled */
     if(monitoringMode == UA_MONITORINGMODE_REPORTING)
-        MonitoredItem_registerSampleCallback(server, mon);
+        UA_MonitoredItem_registerSampleCallback(server, mon);
     return UA_STATUSCODE_GOOD;
 }
 
@@ -278,18 +277,19 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session, struct cre
     }
 
     /* Create the monitoreditem */
-    UA_MonitoredItem *newMon = UA_MonitoredItem_new(cmc->sub);
-    newMon->monitoredItemType = UA_MONITOREDITEMTYPE_CHANGENOTIFY;
+    UA_MonitoredItem *newMon = (UA_MonitoredItem*)UA_malloc(sizeof(UA_MonitoredItem));
     if(!newMon) {
         result->statusCode = UA_STATUSCODE_BADOUTOFMEMORY;
         UA_DataValue_deleteMembers(&v);
         return;
     }
+    UA_MonitoredItem_init(newMon, cmc->sub);
+    newMon->monitoredItemType = UA_MONITOREDITEMTYPE_CHANGENOTIFY;
     UA_StatusCode retval = UA_NodeId_copy(&request->itemToMonitor.nodeId,
                                           &newMon->monitoredNodeId);
     if(retval != UA_STATUSCODE_GOOD) {
         result->statusCode = retval;
-        MonitoredItem_delete(server, newMon);
+        UA_MonitoredItem_delete(server, newMon);
         UA_DataValue_deleteMembers(&v);
         return;
     }
@@ -305,7 +305,7 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session, struct cre
         UA_LOG_INFO_SESSION(server->config.logger, session, "Could not create MonitoredItem "
                             "with status code %s", UA_StatusCode_name(retval));
         result->statusCode = retval;
-        MonitoredItem_delete(server, newMon);
+        UA_MonitoredItem_delete(server, newMon);
         --cmc->sub->lastMonitoredItemId;
         return;
     }
@@ -314,7 +314,7 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session, struct cre
 
     /* Create the first sample */
     if(request->monitoringMode == UA_MONITORINGMODE_REPORTING)
-        UA_MonitoredItem_SampleCallback(server, newMon);
+        UA_MonitoredItem_sampleCallback(server, newMon);
 
     /* Prepare the response */
     result->revisedSamplingInterval = newMon->samplingInterval;
@@ -447,9 +447,9 @@ Operation_SetMonitoringMode(UA_Server *server, UA_Session *session,
 
     mon->monitoringMode = smc->monitoringMode;
     if(mon->monitoringMode == UA_MONITORINGMODE_REPORTING) {
-        MonitoredItem_registerSampleCallback(server, mon);
+        UA_MonitoredItem_registerSampleCallback(server, mon);
     } else {
-        MonitoredItem_unregisterSampleCallback(server, mon);
+        UA_MonitoredItem_unregisterSampleCallback(server, mon);
 
         // TODO correctly implement SAMPLING
         /*  Setting the mode to DISABLED or SAMPLING causes all queued Notifications to be deleted */

src/server/ua_subscription.c

@@ -57,7 +57,7 @@ UA_Subscription_deleteMembers(UA_Server *server, UA_Subscription *sub) {
     UA_MonitoredItem *mon, *tmp_mon;
     LIST_FOREACH_SAFE(mon, &sub->monitoredItems, listEntry, tmp_mon) {
         LIST_REMOVE(mon, listEntry);
-        MonitoredItem_delete(server, mon);
+        UA_MonitoredItem_delete(server, mon);
     }
     sub->monitoredItemsSize = 0;
 
@@ -98,7 +98,7 @@ UA_Subscription_deleteMonitoredItem(UA_Server *server, UA_Subscription *sub,
     sub->monitoredItemsSize--;
 
     /* Remove content and delayed free */
-    MonitoredItem_delete(server, mon);
+    UA_MonitoredItem_delete(server, mon);
 
     return UA_STATUSCODE_GOOD;
 }

src/server/ua_subscription.h

@@ -97,11 +97,11 @@ struct UA_MonitoredItem {
     UA_UInt32 queueSize;
 };
 
-UA_MonitoredItem * UA_MonitoredItem_new(UA_Subscription *sub);
-void MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *monitoredItem);
-void UA_MonitoredItem_SampleCallback(UA_Server *server, UA_MonitoredItem *monitoredItem);
-UA_StatusCode MonitoredItem_registerSampleCallback(UA_Server *server, UA_MonitoredItem *mon);
-UA_StatusCode MonitoredItem_unregisterSampleCallback(UA_Server *server, UA_MonitoredItem *mon);
+void UA_MonitoredItem_init(UA_MonitoredItem *mon, UA_Subscription *sub);
+void UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *mon);
+void UA_MonitoredItem_sampleCallback(UA_Server *server, UA_MonitoredItem *mon);
+UA_StatusCode UA_MonitoredItem_registerSampleCallback(UA_Server *server, UA_MonitoredItem *mon);
+UA_StatusCode UA_MonitoredItem_unregisterSampleCallback(UA_Server *server, UA_MonitoredItem *mon);
 
 /* Remove entries until mon->maxQueueSize is reached. Sets infobits for lost
  * data if required. */

src/server/ua_subscription_datachange.c

@@ -15,18 +15,13 @@
 
 #define UA_VALUENCODING_MAXSTACK 512
 
-UA_MonitoredItem * UA_MonitoredItem_new(UA_Subscription *sub) {
-    UA_MonitoredItem *mon = (UA_MonitoredItem *)UA_calloc(1, sizeof(UA_MonitoredItem));
-    if(!mon)
-        return NULL;
-
+void UA_MonitoredItem_init(UA_MonitoredItem *mon, UA_Subscription *sub) {
+    memset(mon, 0, sizeof(UA_MonitoredItem));
     mon->subscription = sub;
     TAILQ_INIT(&mon->queue);
-    return mon;
 }
 
-void
-MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *monitoredItem) {
+void UA_MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *monitoredItem) {
     UA_Subscription *sub = monitoredItem->subscription;
     UA_LOG_DEBUG_SESSION(server->config.logger, sub->session,
                         "Subscription %u | MonitoredItem %i | "
@@ -35,7 +30,7 @@ MonitoredItem_delete(UA_Server *server, UA_MonitoredItem *monitoredItem) {
 
     if(monitoredItem->monitoredItemType == UA_MONITOREDITEMTYPE_CHANGENOTIFY) {
         /* Remove the sampling callback */
-        MonitoredItem_unregisterSampleCallback(server, monitoredItem);
+        UA_MonitoredItem_unregisterSampleCallback(server, monitoredItem);
 
     } else {
         /* TODO: Access val data.event */
@@ -357,7 +352,7 @@ sampleCallbackWithValue(UA_Server *server, UA_Subscription *sub,
 }
 
 void
-UA_MonitoredItem_SampleCallback(UA_Server *server,
+UA_MonitoredItem_sampleCallback(UA_Server *server,
                                 UA_MonitoredItem *monitoredItem) {
     UA_Subscription *sub = monitoredItem->subscription;
     if(monitoredItem->monitoredItemType != UA_MONITOREDITEMTYPE_CHANGENOTIFY) {
@@ -399,11 +394,11 @@ UA_MonitoredItem_SampleCallback(UA_Server *server,
 }
 
 UA_StatusCode
-MonitoredItem_registerSampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
+UA_MonitoredItem_registerSampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
     if(mon->sampleCallbackIsRegistered)
         return UA_STATUSCODE_GOOD;
     UA_StatusCode retval =
-        UA_Server_addRepeatedCallback(server, (UA_ServerCallback)UA_MonitoredItem_SampleCallback,
+        UA_Server_addRepeatedCallback(server, (UA_ServerCallback)UA_MonitoredItem_sampleCallback,
                                       mon, (UA_UInt32)mon->samplingInterval, &mon->sampleCallbackId);
     if(retval == UA_STATUSCODE_GOOD)
         mon->sampleCallbackIsRegistered = true;
@@ -411,7 +406,7 @@ MonitoredItem_registerSampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
 }
 
 UA_StatusCode
-MonitoredItem_unregisterSampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
+UA_MonitoredItem_unregisterSampleCallback(UA_Server *server, UA_MonitoredItem *mon) {
     if(!mon->sampleCallbackIsRegistered)
         return UA_STATUSCODE_GOOD;
     mon->sampleCallbackIsRegistered = false;

tests/server/check_services_subscriptions.c

@@ -334,21 +334,21 @@ START_TEST(Server_overflow) {
     ck_assert_uint_eq(notification->data.value.hasStatus, false);
 
     UA_ByteString_deleteMembers(&mon->lastSampledValue);
-    UA_MonitoredItem_SampleCallback(server, mon);
+    UA_MonitoredItem_sampleCallback(server, mon);
     ck_assert_uint_eq(mon->queueSize, 2); 
     ck_assert_uint_eq(mon->maxQueueSize, 3); 
     notification = TAILQ_LAST(&mon->queue, NotificationQueue);
     ck_assert_uint_eq(notification->data.value.hasStatus, false);
 
     UA_ByteString_deleteMembers(&mon->lastSampledValue);
-    UA_MonitoredItem_SampleCallback(server, mon);
+    UA_MonitoredItem_sampleCallback(server, mon);
     ck_assert_uint_eq(mon->queueSize, 3); 
     ck_assert_uint_eq(mon->maxQueueSize, 3); 
     notification = TAILQ_LAST(&mon->queue, NotificationQueue);
     ck_assert_uint_eq(notification->data.value.hasStatus, false);
 
     UA_ByteString_deleteMembers(&mon->lastSampledValue);
-    UA_MonitoredItem_SampleCallback(server, mon);
+    UA_MonitoredItem_sampleCallback(server, mon);
     ck_assert_uint_eq(mon->queueSize, 3); 
     ck_assert_uint_eq(mon->maxQueueSize, 3); 
     notification = TAILQ_FIRST(&mon->queue);
@@ -446,7 +446,7 @@ START_TEST(Server_overflow) {
     UA_MonitoredItemModifyRequest_deleteMembers(&itemToModify);
     UA_ModifyMonitoredItemsResponse_deleteMembers(&modifyMonitoredItemsResponse);
 
-    UA_MonitoredItem_SampleCallback(server, mon);
+    UA_MonitoredItem_sampleCallback(server, mon);
     ck_assert_uint_eq(mon->queueSize, 1); 
     ck_assert_uint_eq(mon->maxQueueSize, 1); 
     notification = TAILQ_FIRST(&mon->queue);