Selaa lähdekoodia

rename all opcua_*.c to UA_*.c

MaximilianBauer 10 vuotta sitten
vanhempi
commit
bdb0dd5c7b

+ 2 - 2
.gitignore

@@ -52,7 +52,7 @@ coverage_report
 .autotools
 test-driver
 include/opcua.h
-include/opcua_namespace_0.h
+include/ua_namespace_0.h
 src/opcua.c
-src/opcua_namespace_0.c
+src/ua_namespace_0.c
 

+ 1 - 1
examples/src/opcuaServer.c

@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#include "UA_stack.h"
+#include "ua_stack.h"
 
 
 int main(void) {

+ 2 - 2
include/Makefile.am

@@ -1,8 +1,8 @@
 TOOL_DIR = ../tool
 
-all-local: opcua.h opcua_namespace_0.h
+all-local: opcua.h ua_namespace_0.h
 
 opcua.h: $(TOOL_DIR)/opcua.hgen
 	cp $< $@
-opcua_namespace_0.h: $(TOOL_DIR)/opcua_namespace_0.hgen
+ua_namespace_0.h: $(TOOL_DIR)/ua_namespace_0.hgen
 	cp $< $@

+ 1 - 1
include/opcua_basictypes.h

@@ -1,5 +1,5 @@
 /*
- * opcua_basictypes.h
+ * ua_basictypes.h
  *
  *  Created on: 13.03.2014
  *      Author: mrt

+ 1 - 1
include/UA_indexedList.h

@@ -3,7 +3,7 @@
 
 #include "opcua.h"
 /* UA_indexedList reuses many types of UA_list */
-#include "UA_list.h"
+#include "ua_list.h"
 
 /*
  * Integer Indexed List

include/UA_list.h → include/ua_list.h


+ 3 - 3
include/UA_stack.h

@@ -1,5 +1,5 @@
 /*
- * UA_stack.h
+ * ua_stack.h
  *
  *  Created on: 04.04.2014
  *      Author: mrt
@@ -9,8 +9,8 @@
 #define UA_STACK_H_
 
 #include "opcua.h"
-#include "UA_connection.h"
-#include "UA_list.h"
+#include "ua_connection.h"
+#include "ua_list.h"
 
 #define UA_TL_MAXCONNECTIONS_DEFAULT 10
 

+ 33 - 33
src/Makefile.am

@@ -6,64 +6,64 @@ TOOL_DIR = ../tool
 #__top_builddir__bin_stackTest_out_SOURCES =	opcuaServer.c\
 #											opcua_builtInDatatypes.c\
 #											opcua_binaryEncDec.c\
-#											opcua_transportLayer.c\
+#											ua_transportLayer.c\
 #											opcua_builtInDatatypes.h\
 #											opcua_binaryEncDec.h\
-#											opcua_transportLayer.h\
+#											ua_transportLayer.h\
 #											opcua_advancedDatatypes.h\
 #											opcua_types.h\
 #											opcua_connectionHelper.h\
 #											tcp_layer.h
 
 #lib_LTLIBRARIES = libstack.la
-#libstack_la_SOURCES = opcua_transportLayer.c\
-#					  opcua_transportLayer.h\
+#libstack_la_SOURCES = ua_transportLayer.c\
+#					  ua_transportLayer.h\
 #					  opcua_advancedDatatypes.h\
 #					  opcua_connectionHelper.h	
 lib_LTLIBRARIES = libopen62541.la
 libopen62541_la_LDFLAGS = -avoid-version -no-undefined
 #libopen62541_la_SOURCES = 			opcua.c\
-#						opcua_basictypes.c\
-#						opcua_namespace_0.c\
-#						opcua_transportLayer.c\
-#						opcua_secureLayer.c\
+#						ua_basictypes.c\
+#						ua_namespace_0.c\
+#						ua_transportLayer.c\
+#						ua_secureLayer.c\
 #						tcp_layer.c\
-#						opcua_transportLayer.h\
+#						ua_transportLayer.h\
 #						opcua_connectionHelper.h\
 #						opcua_encodingLayer.h\
-#						opcua_secureLayer.h\
+#						ua_secureLayer.h\
 #						tcp_layer.h\
-#						util/UA_list.c\
-#						util/UA_indexedList.c\
-#						UA_stackInternalTypes.c\
-#						opcua_namespace.h\
-#						opcua_namespace.c
+#						util/ua_list.c\
+#						util/ua_indexedList.c\
+#						ua_stackInternalTypes.c\
+#						ua_namespace.h\
+#						ua_namespace.c
 						
 #libopen62541_ladir = $(top_builddir)/include . $(top_builddir)/src . $(top_builddir)/src/util					
 
 #libopen62541_la_HEADERS = opcua.h\
-#						opcua_basictypes.h\
-#						opcua_namespace.h\
-#						opcua_transportLayer.h\
+#						ua_basictypes.h\
+#						ua_namespace.h\
+#						ua_transportLayer.h\
 #						opcua_connectionHelper.h\
 #						opcua_encodingLayer.h\
-#						opcua_secureLayer.h\
-#						opcua_namespace.h\
-#						UA_connection.h\
-#						UA_stackInternalTypes.h\
-#						UA_list.h\
-#						UA_indexedList.h
+#						ua_secureLayer.h\
+#						ua_namespace.h\
+#						ua_connection.h\
+#						ua_stackInternalTypes.h\
+#						ua_list.h\
+#						ua_indexedList.h
 						
 libopen62541_la_SOURCES = opcua.c\
-						opcua_basictypes.c\
-						opcua_namespace_0.c\
-						UA_stackInternalTypes.c\
-						opcua_transportLayer.c\
-						opcua_secureLayer.c\
-						util/UA_list.c\
-						util/UA_indexedList.c\
-						opcua_namespace.c\
-						UA_stack.c
+						ua_basictypes.c\
+						ua_namespace_0.c\
+						ua_stackInternalTypes.c\
+						ua_transportLayer.c\
+						ua_secureLayer.c\
+						util/ua_list.c\
+						util/ua_indexedList.c\
+						ua_namespace.c\
+						ua_stack.c
 						
 						
 

+ 1 - 1
src/opcua_basictypes.c

@@ -2,7 +2,7 @@
 #include <stdlib.h>	// alloc, free
 #include <string.h>
 #include "opcua.h"
-#include "opcua_basictypes.h"
+#include "ua_basictypes.h"
 
 UA_Int32 UA_encode(void* const data, UA_Int32 *pos, UA_Int32 type, UA_Byte* dst) {
 	return UA_[type].encode(data,pos,dst);

+ 1 - 1
src/UA_connection.h

@@ -1,7 +1,7 @@
 #ifndef OPCUA_CONNECTIONHELPER_H_
 #define OPCUA_CONNECTIONHELPER_H_
 #include "opcua.h"
-#include "UA_stackInternalTypes.h"
+#include "ua_stackInternalTypes.h"
 
 #include <pthread.h>
 

+ 1 - 1
src/opcua_namespace.c

@@ -1,4 +1,4 @@
-#include "opcua_namespace.h"
+#include "ua_namespace.h"
 #include <string.h>
 #include <stdio.h>
 

+ 2 - 2
src/opcua_namespace.h

@@ -7,9 +7,9 @@
 #define __USE_UNIX98
 #include <pthread.h>
 
-#include "opcua_basictypes.h"
+#include "ua_basictypes.h"
 #include "opcua.h"
-#include "UA_list.h"
+#include "ua_list.h"
 
 typedef struct pthread_rwlock_t ns_lock;
 

+ 3 - 3
src/opcua_secureLayer.c

@@ -1,9 +1,9 @@
 #include <stdio.h>
 #include <memory.h> // memcpy
 #include "opcua.h"
-#include "opcua_transportLayer.h"
-#include "opcua_secureLayer.h"
-#include "UA_stackInternalTypes.h"
+#include "ua_transportLayer.h"
+#include "ua_secureLayer.h"
+#include "ua_stackInternalTypes.h"
 
 #define SIZE_SECURECHANNEL_HEADER 12
 #define SIZE_SEQHEADER_HEADER 8

+ 2 - 2
src/opcua_secureLayer.h

@@ -1,8 +1,8 @@
 #ifndef OPCUA_SECURECHANNELLAYER_H_
 #define OPCUA_SECURECHANNELLAYER_H_
 #include "opcua.h"
-#include "UA_connection.h"
-#include "UA_stackInternalTypes.h"
+#include "ua_connection.h"
+#include "ua_stackInternalTypes.h"
 
 UA_Int32 SL_initConnectionObject(UA_SL_Channel *connection);
 UA_Int32 SL_openSecureChannel_responseMessage_get(UA_SL_Channel *connection,

+ 2 - 2
src/UA_stack.c

@@ -9,8 +9,8 @@
 #include <memory.h> // memset
 #include <pthread.h>
 
-#include "UA_stack.h"
-#include "opcua_transportLayer.h"
+#include "ua_stack.h"
+#include "ua_transportLayer.h"
 
 UA_TL_Description UA_TransportLayerDescriptorTcpBinary  = {
 		UA_TL_ENCODING_BINARY,

+ 1 - 1
src/UA_stackInternalTypes.c

@@ -1,4 +1,4 @@
-#include "UA_stackInternalTypes.h"
+#include "ua_stackInternalTypes.h"
 #include "stdio.h"
 
 UA_Int32 UA_MessageType_calcSize(UA_MessageType const * ptr){

src/UA_stackInternalTypes.h → src/ua_stackInternalTypes.h


+ 4 - 4
src/opcua_transportLayer.c

@@ -1,9 +1,9 @@
 #include <memory.h> // memset, memcpy
-#include "UA_stack.h"
-#include "UA_connection.h"
-#include "opcua_transportLayer.h"
+#include "ua_stack.h"
+#include "ua_connection.h"
+#include "ua_transportLayer.h"
 
-#include "opcua_secureLayer.h" // SL_process
+#include "ua_secureLayer.h" // SL_process
 
 UA_Int32 TL_Connection_init(UA_TL_connection* c, UA_TL_data* tld)
 {

+ 4 - 4
src/opcua_transportLayer.h

@@ -1,5 +1,5 @@
 /*
- * opcua_transportLayer.h
+ * ua_transportLayer.h
  *
  *  Created on: Dec 19, 2013
  *      Author: opcua
@@ -10,9 +10,9 @@
 #include <stdio.h>
 
 #include "opcua.h"
-#include "UA_stack.h"
-#include "UA_connection.h"
-#include "UA_stackInternalTypes.h"
+#include "ua_stack.h"
+#include "ua_connection.h"
+#include "ua_stackInternalTypes.h"
 
 /*------------------Defined Error Codes------------------*/
 //transport errors begin at 1000

+ 1 - 1
src/util/UA_indexedList.c

@@ -1,4 +1,4 @@
-#include "UA_indexedList.h"
+#include "ua_indexedList.h"
 
 void UA_indexedList_defaultFreer(void* payload){
 	UA_list_defaultFreer(payload);

+ 1 - 1
src/util/UA_list.c

@@ -1,4 +1,4 @@
-#include "UA_list.h"
+#include "ua_list.h"
 
 void UA_list_defaultFreer(void* payload){
 	if(payload){

+ 1 - 1
tests/check_calcSize.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include "opcua.h"
-#include "opcua_transportLayer.h"
+#include "ua_transportLayer.h"
 #include "check.h"
 
 

+ 1 - 1
tests/check_create.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include "opcua.h"
-#include "opcua_transportLayer.h"
+#include "ua_transportLayer.h"
 #include "check.h"
 
 int main (void)

+ 1 - 1
tests/check_decode.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include "opcua.h"
-#include "opcua_transportLayer.h"
+#include "ua_transportLayer.h"
 #include "check.h"
 
 START_TEST(decodeByte_test)

+ 1 - 1
tests/check_delete.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include "opcua.h"
-#include "opcua_transportLayer.h"
+#include "ua_transportLayer.h"
 #include "check.h"
 
 int main (void)

+ 1 - 1
tests/check_encode.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include "opcua.h"
-#include "opcua_transportLayer.h"
+#include "ua_transportLayer.h"
 #include "check.h"
 
 

+ 1 - 1
tests/check_indexedList.c

@@ -1,5 +1,5 @@
 #include <stdlib.h> // EXIT_SUCCESS
-#include "UA_indexedList.h"
+#include "ua_indexedList.h"
 
 #include "check.h"
 

+ 1 - 1
tests/check_list.c

@@ -1,5 +1,5 @@
 #include <stdlib.h> // EXIT_SUCCESS
-#include "UA_list.h"
+#include "ua_list.h"
 #include "check.h"
 
 /* global test counters */

+ 1 - 1
tests/check_namespace.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include "opcua.h"
-#include "opcua_namespace.h"
+#include "ua_namespace.h"
 #include "check.h"
 
 

+ 1 - 1
tests/check_stack.c

@@ -12,7 +12,7 @@
 #include <stdlib.h>
 
 #include "opcua.h"
-#include "opcua_transportLayer.h"
+#include "ua_transportLayer.h"
 #include "check.h"
 
 

+ 1 - 1
tool/Makefile.am

@@ -1,7 +1,7 @@
 SRC_DIR = $(top_builddir)/src
 INCLUDE_DIR = $(top_builddir)/include
 AUTO_NAME = opcua
-NS0_NAME = opcua_namespace_0
+NS0_NAME = ua_namespace_0
 
 all-local: $(AUTO_NAME).cgen $(AUTO_NAME).hgen $(NS0_NAME).cgen $(NS0_NAME).hgen
 

+ 2 - 2
tool/generate_builtin.py

@@ -302,8 +302,8 @@ print('''/**********************************************************
  **********************************************************/
 #ifndef OPCUA_H_''', end='\n', file=fh)
 print('#define OPCUA_H_', end='\n', file=fh)
-print('#include "opcua_basictypes.h"', end='\n', file=fh)
-print('#include "opcua_namespace_0.h"', end='\n', file=fh);
+print('#include "ua_basictypes.h"', end='\n', file=fh)
+print('#include "ua_namespace_0.h"', end='\n', file=fh);
 
 
 #plugin handling