浏览代码

Changed UA_Server_methodNode_attachCallboack to UA_Server_setMethodNode_callback to conform to naming scheme of very similar dataSources function.

ichrispa 9 年之前
父节点
当前提交
330324771e
共有 3 个文件被更改,包括 5 次插入5 次删除
  1. 1 1
      examples/server_method.c
  2. 2 2
      include/ua_server.h
  3. 2 2
      src/server/ua_services_nodemanagement.c

+ 1 - 1
examples/server_method.c

@@ -154,7 +154,7 @@ int main(int argc, char** argv) {
     /* If out methodnode is part of an instantiated object, we never had
     /* If out methodnode is part of an instantiated object, we never had
        the opportunity to define the callback... we could do that now
        the opportunity to define the callback... we could do that now
     */
     */
-    UA_Server_methodNode_attachCallback(server, UA_NODEID_NUMERIC(1,62541), &fooBarMethod, NULL);
+    UA_Server_setMethodNode_callback(server, UA_NODEID_NUMERIC(1,62541), &fooBarMethod, NULL);
     
     
     //END OF EXAMPLE 3
     //END OF EXAMPLE 3
     /* start server */
     /* start server */

+ 2 - 2
include/ua_server.h

@@ -357,8 +357,8 @@ typedef UA_StatusCode (*UA_MethodCallback)(void *methodHandle, const UA_NodeId o
 
 
 #ifdef UA_ENABLE_METHODCALLS
 #ifdef UA_ENABLE_METHODCALLS
 UA_StatusCode UA_EXPORT
 UA_StatusCode UA_EXPORT
-UA_Server_methodNode_attachCallback(UA_Server *server, const UA_NodeId methodNodeId,
-				    UA_MethodCallback method, void *handle);
+UA_Server_setMethodNode_callback(UA_Server *server, const UA_NodeId methodNodeId,
+				 UA_MethodCallback method, void *handle);
 
 
 UA_StatusCode UA_EXPORT
 UA_StatusCode UA_EXPORT
 UA_Server_addMethodNode(UA_Server *server, const UA_NodeId requestedNewNodeId,
 UA_Server_addMethodNode(UA_Server *server, const UA_NodeId requestedNewNodeId,

+ 2 - 2
src/server/ua_services_nodemanagement.c

@@ -755,8 +755,8 @@ static UA_StatusCode __UA_Server_editMethodCallback(UA_Server *server, UA_Sessio
 }
 }
 
 
 UA_StatusCode UA_EXPORT
 UA_StatusCode UA_EXPORT
-UA_Server_methodNode_attachCallback(UA_Server *server, const UA_NodeId methodNodeId,
-				    UA_MethodCallback method, void *handle) {
+UA_Server_setMethodNode_callback( UA_Server *server, const UA_NodeId methodNodeId,
+                                  UA_MethodCallback method, void *handle) {
   struct {
   struct {
     UA_MethodCallback callback;
     UA_MethodCallback callback;
     void *handle;
     void *handle;