Przeglądaj źródła

remove UA_EXPORT from source files and internal headers

Julius Pfrommer 7 lat temu
rodzic
commit
30760d1bba

+ 1 - 1
src/client/ua_client.c

@@ -65,7 +65,7 @@ void UA_Client_delete(UA_Client* client){
     UA_free(client);
     UA_free(client);
 }
 }
 
 
-UA_ClientState UA_EXPORT UA_Client_getState(UA_Client *client) {
+UA_ClientState UA_Client_getState(UA_Client *client) {
     if(!client)
     if(!client)
         return UA_CLIENTSTATE_ERRORED;
         return UA_CLIENTSTATE_ERRORED;
     return client->state;
     return client->state;

+ 2 - 2
src/client/ua_client_highlevel.c

@@ -86,7 +86,7 @@ UA_Client_forEachChildNodeCall(UA_Client *client, UA_NodeId parentNodeId,
 /* Node Management */
 /* Node Management */
 /*******************/
 /*******************/
 
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_Client_addReference(UA_Client *client, const UA_NodeId sourceNodeId,
 UA_Client_addReference(UA_Client *client, const UA_NodeId sourceNodeId,
                        const UA_NodeId referenceTypeId, UA_Boolean isForward,
                        const UA_NodeId referenceTypeId, UA_Boolean isForward,
                        const UA_String targetServerUri,
                        const UA_String targetServerUri,
@@ -119,7 +119,7 @@ UA_Client_addReference(UA_Client *client, const UA_NodeId sourceNodeId,
     return retval;
     return retval;
 }
 }
 
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_Client_deleteReference(UA_Client *client, const UA_NodeId sourceNodeId,
 UA_Client_deleteReference(UA_Client *client, const UA_NodeId sourceNodeId,
                           const UA_NodeId referenceTypeId, UA_Boolean isForward,
                           const UA_NodeId referenceTypeId, UA_Boolean isForward,
                           const UA_ExpandedNodeId targetNodeId,
                           const UA_ExpandedNodeId targetNodeId,

+ 1 - 1
src/server/ua_server.c

@@ -97,7 +97,7 @@ static void UA_Server_deleteExternalNamespaces(UA_Server *server) {
     }
     }
 }
 }
 
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_Server_addExternalNamespace(UA_Server *server, const UA_String *url,
 UA_Server_addExternalNamespace(UA_Server *server, const UA_String *url,
                                UA_ExternalNodeStore *nodeStore,
                                UA_ExternalNodeStore *nodeStore,
                                UA_UInt16 *assignedNamespaceIndex) {
                                UA_UInt16 *assignedNamespaceIndex) {

+ 4 - 4
src/server/ua_services_nodemanagement.c

@@ -999,7 +999,7 @@ UA_Server_addMethodNode(UA_Server *server, const UA_NodeId requestedNewNodeId,
         inputArgumentsVariableNode->description = UA_LOCALIZEDTEXT_ALLOC("en_US", "InputArguments");
         inputArgumentsVariableNode->description = UA_LOCALIZEDTEXT_ALLOC("en_US", "InputArguments");
         inputArgumentsVariableNode->valueRank = 1;
         inputArgumentsVariableNode->valueRank = 1;
 
 
-        /* UAExport creates a monitoreditem on inputarguments ... */
+        /* UAExpert creates a monitoreditem on inputarguments ... */
         inputArgumentsVariableNode->minimumSamplingInterval = 10000.0f;
         inputArgumentsVariableNode->minimumSamplingInterval = 10000.0f;
 
 
         //TODO: 0.3 work item: the addMethodNode API does not have the possibility to set nodeIDs
         //TODO: 0.3 work item: the addMethodNode API does not have the possibility to set nodeIDs
@@ -1417,7 +1417,7 @@ setValueCallback(UA_Server *server, UA_Session *session,
     return UA_STATUSCODE_GOOD;
     return UA_STATUSCODE_GOOD;
 }
 }
 
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_Server_setVariableNode_valueCallback(UA_Server *server, const UA_NodeId nodeId,
 UA_Server_setVariableNode_valueCallback(UA_Server *server, const UA_NodeId nodeId,
                                         const UA_ValueCallback callback) {
                                         const UA_ValueCallback callback) {
     UA_RCU_LOCK();
     UA_RCU_LOCK();
@@ -1466,7 +1466,7 @@ setOLM(UA_Server *server, UA_Session *session,
     return UA_STATUSCODE_GOOD;
     return UA_STATUSCODE_GOOD;
 }
 }
 
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_Server_setObjectTypeNode_lifecycleManagement(UA_Server *server, UA_NodeId nodeId,
 UA_Server_setObjectTypeNode_lifecycleManagement(UA_Server *server, UA_NodeId nodeId,
                                                 UA_ObjectLifecycleManagement olm) {
                                                 UA_ObjectLifecycleManagement olm) {
     UA_RCU_LOCK();
     UA_RCU_LOCK();
@@ -1499,7 +1499,7 @@ editMethodCallback(UA_Server *server, UA_Session* session,
     return UA_STATUSCODE_GOOD;
     return UA_STATUSCODE_GOOD;
 }
 }
 
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_Server_setMethodNode_callback(UA_Server *server, const UA_NodeId methodNodeId,
 UA_Server_setMethodNode_callback(UA_Server *server, const UA_NodeId methodNodeId,
                                  UA_MethodCallback method, void *handle) {
                                  UA_MethodCallback method, void *handle) {
     struct addMethodCallback cb = { method, handle };
     struct addMethodCallback cb = { method, handle };

+ 2 - 2
src/ua_types_encoding_binary.h

@@ -9,12 +9,12 @@
 
 
 typedef UA_StatusCode (*UA_exchangeEncodeBuffer)(void *handle, UA_ByteString *buf, size_t offset);
 typedef UA_StatusCode (*UA_exchangeEncodeBuffer)(void *handle, UA_ByteString *buf, size_t offset);
 
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_encodeBinary(const void *src, const UA_DataType *type,
 UA_encodeBinary(const void *src, const UA_DataType *type,
                 UA_exchangeEncodeBuffer exchangeCallback, void *exchangeHandle,
                 UA_exchangeEncodeBuffer exchangeCallback, void *exchangeHandle,
                 UA_ByteString *dst, size_t *offset) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
                 UA_ByteString *dst, size_t *offset) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
 
 
-UA_StatusCode UA_EXPORT
+UA_StatusCode
 UA_decodeBinary(const UA_ByteString *src, size_t *offset, void *dst,
 UA_decodeBinary(const UA_ByteString *src, size_t *offset, void *dst,
                 const UA_DataType *type) UA_FUNC_ATTR_WARN_UNUSED_RESULT;
                 const UA_DataType *type) UA_FUNC_ATTR_WARN_UNUSED_RESULT;