소스 검색

Untabify

Command used:
`find . \( -name '*.c' -o -name '*.h' \) -not \( -path "./deps/*" -prune \) ! -type d -exec bash -c 'expand -t 4 "$0" > /tmp/e && mv /tmp/e "$0"' {} \;`
Stefan Profanter 8 년 전
부모
커밋
99116b1cdf
7개의 변경된 파일44개의 추가작업 그리고 44개의 파일을 삭제
  1. 5 5
      examples/server_nodeset.c
  2. 9 9
      examples/server_udp.c
  3. 3 3
      include/ua_types.h
  4. 19 19
      plugins/ua_network_udp.c
  5. 1 1
      src/client/ua_client.c
  6. 1 1
      tests/check_server_userspace.c
  7. 6 6
      tests/check_utils.c

+ 5 - 5
examples/server_nodeset.c

@@ -37,11 +37,11 @@ int main(int argc, char** argv) {
 
     /* create nodes from nodeset */
     if (nodeset(server) != UA_STATUSCODE_GOOD) {
-		UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER, "Namespace index for generated nodeset does not match. The call to the generated method has to be before any other namespace add calls.");
-		UA_Server_delete(server);
-		nl.deleteMembers(&nl);
-		return (int)UA_STATUSCODE_BADUNEXPECTEDERROR;
-	}
+        UA_LOG_ERROR(logger, UA_LOGCATEGORY_SERVER, "Namespace index for generated nodeset does not match. The call to the generated method has to be before any other namespace add calls.");
+        UA_Server_delete(server);
+        nl.deleteMembers(&nl);
+        return (int)UA_STATUSCODE_BADUNEXPECTEDERROR;
+    }
 
     /* start server */
     UA_StatusCode retval = UA_Server_run(server, &running); //UA_blocks until running=false

+ 9 - 9
examples/server_udp.c

@@ -26,15 +26,15 @@ static void stopHandler(int sign) {
 }
 
 int main(int argc, char** argv) {
-	signal(SIGINT,  stopHandler);
-	signal(SIGTERM, stopHandler);
-
-	UA_ServerConfig config = UA_ServerConfig_standard;
-	UA_ServerNetworkLayer nl;
-	nl = UA_ServerNetworkLayerUDP(UA_ConnectionConfig_standard, 16664);
-	config.networkLayers = &nl;
-	config.networkLayersSize = 1;
-	UA_Server *server = UA_Server_new(config);
+    signal(SIGINT,  stopHandler);
+    signal(SIGTERM, stopHandler);
+
+    UA_ServerConfig config = UA_ServerConfig_standard;
+    UA_ServerNetworkLayer nl;
+    nl = UA_ServerNetworkLayerUDP(UA_ConnectionConfig_standard, 16664);
+    config.networkLayers = &nl;
+    config.networkLayersSize = 1;
+    UA_Server *server = UA_Server_new(config);
 
     // add a variable node to the adresspace
     UA_VariableAttributes attr;

+ 3 - 3
include/ua_types.h

@@ -147,9 +147,9 @@ typedef double UA_Double;
 typedef uint32_t UA_StatusCode;
 
 typedef struct {
-	UA_StatusCode code;      /* The numeric value of the StatusCode */
-	const char* name;        /* The symbolic name */
-	const char* explanation; /* Short message explaining the StatusCode */
+    UA_StatusCode code;      /* The numeric value of the StatusCode */
+    const char* name;        /* The symbolic name */
+    const char* explanation; /* Short message explaining the StatusCode */
 } UA_StatusCodeDescription;
 
 /* Returns the description of the StatusCode. Never returns NULL, but a generic

+ 19 - 19
plugins/ua_network_udp.c

@@ -66,11 +66,11 @@ typedef struct {
 
 typedef struct {
     UA_ConnectionConfig conf;
-	UA_UInt16 port;
+    UA_UInt16 port;
     fd_set fdset;
     UA_Int32 serversockfd;
 
-	UA_Logger logger; // Set during start
+    UA_Logger logger; // Set during start
 } ServerNetworkLayerUDP;
 
 /** Accesses only the sockfd in the handle. Can be run from parallel threads. */
@@ -125,7 +125,7 @@ static void closeConnectionUDP(UA_Connection *handle) {
 }
 
 static UA_StatusCode ServerNetworkLayerUDP_start(UA_ServerNetworkLayer *nl, UA_Logger logger) {
-	ServerNetworkLayerUDP *layer = nl->handle;
+    ServerNetworkLayerUDP *layer = nl->handle;
     layer->logger = logger;
     layer->serversockfd = socket(PF_INET, SOCK_DGRAM, 0);
     if(layer->serversockfd < 0) {
@@ -155,7 +155,7 @@ static UA_StatusCode ServerNetworkLayerUDP_start(UA_ServerNetworkLayer *nl, UA_L
 }
 
 static size_t ServerNetworkLayerUDP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **jobs, UA_UInt16 timeout) {
-	ServerNetworkLayerUDP *layer = nl->handle;
+    ServerNetworkLayerUDP *layer = nl->handle;
     UA_Job *items = NULL;
     setFDSet(layer);
     struct timeval tmptv = {0, timeout};
@@ -166,7 +166,7 @@ static size_t ServerNetworkLayerUDP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **
     }
     items = malloc(sizeof(UA_Job)*(unsigned long)resultsize);
     // read from established sockets
-	size_t j = 0;
+    size_t j = 0;
     UA_ByteString buf = {0, NULL};
     if(!buf.data) {
         buf.data = malloc(sizeof(UA_Byte) * layer->conf.recvBufferSize);
@@ -213,23 +213,23 @@ static size_t ServerNetworkLayerUDP_getJobs(UA_ServerNetworkLayer *nl, UA_Job **
 }
 
 static size_t ServerNetworkLayerUDP_stop(UA_ServerNetworkLayer *nl, UA_Job **jobs) {
-	ServerNetworkLayerUDP *layer = nl->handle;
-	UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
-				"Shutting down the UDP network layer");
+    ServerNetworkLayerUDP *layer = nl->handle;
+    UA_LOG_INFO(layer->logger, UA_LOGCATEGORY_NETWORK,
+                "Shutting down the UDP network layer");
     CLOSESOCKET(layer->serversockfd);
     return 0;
 }
 
 static void ServerNetworkLayerUDP_deleteMembers(UA_ServerNetworkLayer *nl) {
-	ServerNetworkLayerUDP *layer = nl->handle;
-	free(layer);
-	UA_String_deleteMembers(&nl->discoveryUrl);
+    ServerNetworkLayerUDP *layer = nl->handle;
+    free(layer);
+    UA_String_deleteMembers(&nl->discoveryUrl);
 }
 
 UA_ServerNetworkLayer
 UA_ServerNetworkLayerUDP(UA_ConnectionConfig conf, UA_UInt16 port) {
-	UA_ServerNetworkLayer nl;
-	memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
+    UA_ServerNetworkLayer nl;
+    memset(&nl, 0, sizeof(UA_ServerNetworkLayer));
 
     ServerNetworkLayerUDP *layer = malloc(sizeof(ServerNetworkLayerUDP));
     if(!layer)
@@ -239,10 +239,10 @@ UA_ServerNetworkLayerUDP(UA_ConnectionConfig conf, UA_UInt16 port) {
     layer->conf = conf;
     layer->port = port;
 
-	nl.handle = layer;
-	nl.start = ServerNetworkLayerUDP_start;
-	nl.getJobs = ServerNetworkLayerUDP_getJobs;
-	nl.stop = ServerNetworkLayerUDP_stop;
-	nl.deleteMembers = ServerNetworkLayerUDP_deleteMembers;
-	return nl;
+    nl.handle = layer;
+    nl.start = ServerNetworkLayerUDP_start;
+    nl.getJobs = ServerNetworkLayerUDP_getJobs;
+    nl.stop = ServerNetworkLayerUDP_stop;
+    nl.deleteMembers = ServerNetworkLayerUDP_deleteMembers;
+    return nl;
 }

+ 1 - 1
src/client/ua_client.c

@@ -688,7 +688,7 @@ static void
 processServiceResponse(struct ResponseDescription *rd, UA_SecureChannel *channel,
                        UA_MessageType messageType, UA_UInt32 requestId,
                        UA_ByteString *message) {
-	const UA_NodeId expectedNodeId =
+    const UA_NodeId expectedNodeId =
         UA_NODEID_NUMERIC(0, rd->responseType->binaryEncodingId);
     const UA_NodeId serviceFaultNodeId =
         UA_NODEID_NUMERIC(0, UA_TYPES[UA_TYPES_SERVICEFAULT].binaryEncodingId);

+ 1 - 1
tests/check_server_userspace.c

@@ -18,7 +18,7 @@ START_TEST(Server_addNamespace_ShallWork)
     UA_UInt16 b = UA_Server_addNamespace(server, "http://nameOfNamespace");
     UA_UInt16 c = UA_Server_addNamespace(server, "http://nameOfNamespace2");
 
-	UA_Server_delete(server);
+    UA_Server_delete(server);
 
     ck_assert_uint_gt(a, 0);
     ck_assert_uint_eq(a,b);

+ 6 - 6
tests/check_utils.c

@@ -122,11 +122,11 @@ START_TEST(StatusCode_msg) {
     ck_assert_str_eq(UA_StatusCode_msg(UA_STATUSCODE_GOOD), "StatusCode descriptions not available");
     return;
 #endif
-		// first element in table
+        // first element in table
     ck_assert_str_eq(UA_StatusCode_explanation(UA_STATUSCODE_GOOD), "Success / No error");
     ck_assert_str_eq(UA_StatusCode_name(UA_STATUSCODE_GOOD), "Good");
 
-		// just some randomly picked status codes
+        // just some randomly picked status codes
     ck_assert_str_eq(UA_StatusCode_explanation(UA_STATUSCODE_BADNOCOMMUNICATION),
                      "Communication with the data source is defined");
     ck_assert_str_eq(UA_StatusCode_name(UA_STATUSCODE_BADNOCOMMUNICATION),
@@ -136,15 +136,15 @@ START_TEST(StatusCode_msg) {
                      "No data exists for the requested time range or event filter.");
     ck_assert_str_eq(UA_StatusCode_name(UA_STATUSCODE_GOODNODATA), "GoodNoData");
 
-		// last element in table
+        // last element in table
     ck_assert_str_eq(UA_StatusCode_explanation(UA_STATUSCODE_BADMAXCONNECTIONSREACHED),
                      "The operation could not be finished because all available connections are in use.");
     ck_assert_str_eq(UA_StatusCode_name(UA_STATUSCODE_BADMAXCONNECTIONSREACHED),
                      "BadMaxConnectionsReached");
 
-		// an invalid status code
-	ck_assert_str_eq(UA_StatusCode_explanation(0x80123456), "Unknown StatusCode");
-	ck_assert_str_eq(UA_StatusCode_name(0x80123456), "Unknown");
+        // an invalid status code
+    ck_assert_str_eq(UA_StatusCode_explanation(0x80123456), "Unknown StatusCode");
+    ck_assert_str_eq(UA_StatusCode_name(0x80123456), "Unknown");
 }
 END_TEST