rename numMonitoredItems to monitoredItemsSize

src/server/ua_services_subscription.c

@@ -220,7 +220,7 @@ Operation_CreateMonitoredItem(UA_Server *server, UA_Session *session, struct cre
                               UA_MonitoredItemCreateResult *result) {
     /* Check available capacity */
     if(server->config.maxMonitoredItemsPerSubscription != 0 &&
-       UA_Subscription_getNumMonitoredItems(cmc->sub) >= server->config.maxMonitoredItemsPerSubscription) {
+       cmc->sub->monitoredItemsSize >= server->config.maxMonitoredItemsPerSubscription) {
         result->statusCode = UA_STATUSCODE_BADTOOMANYMONITOREDITEMS;
         return;
     }

src/server/ua_subscription.c

@@ -30,8 +30,6 @@ UA_Subscription_new(UA_Session *session, UA_UInt32 subscriptionId) {
     /* Remaining members are covered by calloc zeroing out the memory */
     newSub->session = session;
     newSub->subscriptionId = subscriptionId;
-    newSub->numMonitoredItems = 0;
-    newSub->notificationQueueSize = 0;
     newSub->state = UA_SUBSCRIPTIONSTATE_NORMAL; /* The first publish response is sent immediately */
     TAILQ_INIT(&newSub->retransmissionQueue);
     TAILQ_INIT(&newSub->notificationQueue);
@@ -50,7 +48,7 @@ UA_Subscription_deleteMembers(UA_Server *server, UA_Subscription *sub) {
     LIST_FOREACH_SAFE(mon, &sub->monitoredItems, listEntry, tmp_mon) {
         MonitoredItem_delete(server, mon);
     }
-    sub->numMonitoredItems = 0;
+    sub->monitoredItemsSize = 0;
 
     /* Delete Retransmission Queue */
     UA_NotificationMessageEntry *nme, *nme_tmp;
@@ -87,21 +85,16 @@ UA_Subscription_deleteMonitoredItem(UA_Server *server, UA_Subscription *sub,
 
     /* Remove the MonitoredItem */
     MonitoredItem_delete(server, mon);
-    sub->numMonitoredItems--;
+    sub->monitoredItemsSize--;
     return UA_STATUSCODE_GOOD;
 }
 
 void
 UA_Subscription_addMonitoredItem(UA_Subscription *sub, UA_MonitoredItem *newMon) {
-    sub->numMonitoredItems++;
+    sub->monitoredItemsSize++;
     LIST_INSERT_HEAD(&sub->monitoredItems, newMon, listEntry);
 }
 
-UA_UInt32
-UA_Subscription_getNumMonitoredItems(UA_Subscription *sub) {
-    return sub->numMonitoredItems;
-}
-
 static void
 UA_Subscription_addRetransmissionMessage(UA_Server *server, UA_Subscription *sub,
                                          UA_NotificationMessageEntry *entry) {

src/server/ua_subscription.h

@@ -132,7 +132,6 @@ struct UA_Subscription {
     UA_UInt32 currentKeepAliveCount;
     UA_UInt32 currentLifetimeCount;
     UA_UInt32 lastMonitoredItemId;
-    UA_UInt32 numMonitoredItems;
 
     /* Publish Callback */
     UA_UInt64 publishCallbackId;
@@ -140,6 +139,7 @@ struct UA_Subscription {
 
     /* MonitoredItems */
     LIST_HEAD(UA_ListOfUAMonitoredItems, UA_MonitoredItem) monitoredItems;
+    UA_UInt32 monitoredItemsSize;
 
     NotificationQueue notificationQueue;
     UA_UInt32 notificationQueueSize;
@@ -154,19 +154,17 @@ void UA_Subscription_deleteMembers(UA_Server *server, UA_Subscription *sub);
 UA_StatusCode Subscription_registerPublishCallback(UA_Server *server, UA_Subscription *sub);
 UA_StatusCode Subscription_unregisterPublishCallback(UA_Server *server, UA_Subscription *sub);
 
-UA_StatusCode
-UA_Subscription_deleteMonitoredItem(UA_Server *server, UA_Subscription *sub,
-                                    UA_UInt32 monitoredItemId);
-
 void
 UA_Subscription_addMonitoredItem(UA_Subscription *sub,
                                  UA_MonitoredItem *newMon);
-UA_UInt32
-UA_Subscription_getNumMonitoredItems(UA_Subscription *sub);
 
 UA_MonitoredItem *
 UA_Subscription_getMonitoredItem(UA_Subscription *sub, UA_UInt32 monitoredItemId);
 
+UA_StatusCode
+UA_Subscription_deleteMonitoredItem(UA_Server *server, UA_Subscription *sub,
+                                    UA_UInt32 monitoredItemId);
+
 void UA_Subscription_publishCallback(UA_Server *server, UA_Subscription *sub);
 
 UA_StatusCode