improve wording

src/server/ua_nodes.c

@@ -100,7 +100,7 @@ UA_StatusCode UA_ObjectTypeNode_copy(const UA_ObjectTypeNode *src, UA_ObjectType
 void UA_VariableNode_init(UA_VariableNode *p) {
 	UA_Node_init((UA_Node*)p);
     p->nodeClass = UA_NODECLASS_VARIABLE;
-    p->variableType = UA_VARIABLETYPE_VARIANT;
+    p->variableType = UA_VARIABLENODETYPE_VARIANT;
     UA_Variant_init(&p->variable.variant);
     p->valueRank = -2; // scalar or array of any dimension
     p->accessLevel = 0;
@@ -118,7 +118,7 @@ UA_VariableNode * UA_VariableNode_new(void) {
 
 void UA_VariableNode_deleteMembers(UA_VariableNode *p) {
     UA_Node_deleteMembers((UA_Node*)p);
-    if(p->variableType == UA_VARIABLETYPE_VARIANT)
+    if(p->variableType == UA_VARIABLENODETYPE_VARIANT)
         UA_Variant_deleteMembers(&p->variable.variant);
 }
 
@@ -131,7 +131,7 @@ UA_StatusCode UA_VariableNode_copy(const UA_VariableNode *src, UA_VariableNode *
     UA_VariableNode_init(dst);
 	UA_StatusCode retval = UA_Node_copy((const UA_Node*)src, (UA_Node*)dst);
     dst->variableType = src->variableType;
-    if(src->variableType == UA_VARIABLETYPE_VARIANT)
+    if(src->variableType == UA_VARIABLENODETYPE_VARIANT)
         retval = UA_Variant_copy(&src->variable.variant, &dst->variable.variant);
     else
         dst->variable.dataSource = src->variable.dataSource;

src/server/ua_nodes.h

@@ -40,8 +40,8 @@ typedef struct {
                              n = -2: the value can be a scalar or an array with any number of dimensions.
                              n = -3:  the value can be a scalar or a one dimensional array. */
     enum {
-        UA_VARIABLETYPE_VARIANT,
-        UA_VARIABLETYPE_DATASOURCE
+        UA_VARIABLENODETYPE_VARIANT,
+        UA_VARIABLENODETYPE_DATASOURCE
     } variableType;
     union {
         UA_Variant variant;

src/server/ua_server.c

@@ -623,7 +623,7 @@ UA_Server * UA_Server_new(void) {
     UA_VariableNode *namespaceArray = UA_VariableNode_new();
     COPYNAMES(namespaceArray, "NamespaceArray");
     namespaceArray->nodeId.identifier.numeric = UA_NS0ID_SERVER_NAMESPACEARRAY;
-    namespaceArray->variableType = UA_VARIABLETYPE_VARIANT;
+    namespaceArray->variableType = UA_VARIABLENODETYPE_VARIANT;
     namespaceArray->variable.variant.dataPtr = UA_Array_new(&UA_TYPES[UA_TYPES_STRING], 2);
     namespaceArray->variable.variant.arrayLength = 2;
     namespaceArray->variable.variant.type = &UA_TYPES[UA_TYPES_STRING];
@@ -642,7 +642,7 @@ UA_Server * UA_Server_new(void) {
     UA_VariableNode *serverstatus = UA_VariableNode_new();
     COPYNAMES(serverstatus, "ServerStatus");
     serverstatus->nodeId = UA_NODEID_STATIC(0, UA_NS0ID_SERVER_SERVERSTATUS);
-    serverstatus->variableType = UA_VARIABLETYPE_DATASOURCE;
+    serverstatus->variableType = UA_VARIABLENODETYPE_DATASOURCE;
     serverstatus->variable.dataSource = (UA_DataSource) {.handle = server, .read = readStatus,
                                                          .release = releaseStatus, .write = UA_NULL};
     UA_Server_addNode(server, (UA_Node*)serverstatus, &UA_EXPANDEDNODEID_STATIC(0, UA_NS0ID_SERVER),
@@ -653,7 +653,7 @@ UA_Server * UA_Server_new(void) {
     *stateEnum = UA_SERVERSTATE_RUNNING;
     COPYNAMES(state, "State");
     state->nodeId.identifier.numeric = UA_NS0ID_SERVER_SERVERSTATUS_STATE;
-    state->variableType = UA_VARIABLETYPE_VARIANT;
+    state->variableType = UA_VARIABLENODETYPE_VARIANT;
     state->variable.variant.type = &UA_TYPES[UA_TYPES_SERVERSTATE];
     state->variable.variant.arrayLength = 1;
     state->variable.variant.dataPtr = stateEnum; // points into the other object.

src/server/ua_server_addressspace.c

@@ -30,7 +30,7 @@ UA_StatusCode UA_Server_addDataSourceVariableNode(UA_Server *server, UA_DataSour
                                                   const UA_NodeId *parentNodeId,
                                                   const UA_NodeId *referenceTypeId) {
     UA_VariableNode *node = UA_VariableNode_new();
-    node->variableType = UA_VARIABLETYPE_DATASOURCE;
+    node->variableType = UA_VARIABLENODETYPE_DATASOURCE;
     node->variable.dataSource = dataSource;
     UA_NodeId_copy(nodeId, &node->nodeId);
     UA_QualifiedName_copy(browseName, &node->browseName);

src/server/ua_services_attribute.c

@@ -101,7 +101,7 @@ static void readValue(UA_Server *server, const UA_ReadValueId *id, UA_DataValue
         CHECK_NODECLASS(UA_NODECLASS_VARIABLE | UA_NODECLASS_VARIABLETYPE);
         {
             const UA_VariableNode *vn = (const UA_VariableNode*)node;
-            if(vn->variableType == UA_VARIABLETYPE_VARIANT) {
+            if(vn->variableType == UA_VARIABLENODETYPE_VARIANT) {
                 retval = UA_Variant_copy(&vn->variable.variant, &v->value);
                 if(retval == UA_STATUSCODE_GOOD){
                     v->hasVariant = UA_TRUE;
@@ -133,7 +133,7 @@ static void readValue(UA_Server *server, const UA_ReadValueId *id, UA_DataValue
                                               UA_TYPES_NODEID);
         else {
             const UA_VariableNode *vn = (const UA_VariableNode*)node;
-            if(vn->variableType == UA_VARIABLETYPE_VARIANT)
+            if(vn->variableType == UA_VARIABLENODETYPE_VARIANT)
                 retval |= UA_Variant_copySetValue(&v->value, &vn->variable.variant.type->typeId,
                                                   UA_TYPES_NODEID);
             else {
@@ -161,7 +161,7 @@ static void readValue(UA_Server *server, const UA_ReadValueId *id, UA_DataValue
         CHECK_NODECLASS(UA_NODECLASS_VARIABLE | UA_NODECLASS_VARIABLETYPE);
         {
             const UA_VariableNode *vn = (const UA_VariableNode *)node;
-            if(vn->variableType == UA_VARIABLETYPE_VARIANT) {
+            if(vn->variableType == UA_VARIABLENODETYPE_VARIANT) {
                 retval = UA_Variant_copySetArray(&v->value, vn->variable.variant.arrayDimensions,
                                                  vn->variable.variant.arrayDimensionsSize, UA_TYPES_INT32);
                 if(retval == UA_STATUSCODE_GOOD)
@@ -346,7 +346,7 @@ static UA_StatusCode writeValue(UA_Server *server, UA_WriteValue *wvalue) {
         case UA_ATTRIBUTEID_VALUE:
             if(node->nodeClass == UA_NODECLASS_VARIABLE) {
                 const UA_VariableNode *vn = (const UA_VariableNode*)node;
-                if(vn->variableType == UA_VARIABLETYPE_DATASOURCE) {
+                if(vn->variableType == UA_VARIABLENODETYPE_DATASOURCE) {
                     if(!vn->variable.dataSource.write) {
                         retval = UA_STATUSCODE_BADWRITENOTSUPPORTED;
                         break;