Changeset 50135 in vbox for trunk/src/VBox/Devices

Timestamp:

Jan 21, 2014 9:28:21 AM (11 years ago)

Author:

vboxsync

Message:

Devices/NAT: a warning and spaces

File:

• trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.c (modified) (21 diffs)

trunk/src/VBox/Devices/Network/slirp/resolv_conf_parser.c

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * resolv_conf_parser.c - parser of resolv.conf resolver(5) 
+ * resolv_conf_parser.c - parser of resolv.conf resolver(5)
  */
 
@@ -29 +29 @@
 #include "resolv_conf_parser.h"
 
-enum RCP_TOKEN {
+enum RCP_TOKEN
+{
   tok_eof = -1, /* EOF */
   tok_string = -2, /* string */
@@ -90 +91 @@
         int xdigit, digit, dot_number;
         RT_ZERO(parser->rcpp_str_buffer);
-        
+
         dot_number = 0;
         xdigit = 1;
@@ -116 +117 @@
                 {
                     int port = 0;
-                    do 
+                    do
                     {
                         *ptr++ = tok;
@@ -127 +128 @@
 
                     PARSER_BUFFER_EXCEEDED(parser, ptr);
-                    
-                    if (port == 0) 
+
+                    if (port == 0)
                         return tok_ipv6;
                     else if (port == 1)
                         return tok_ipv6_port;
-                    else 
+                    else
                     {
                         /* eats rest of the token */
-                        do 
+                        do
                         {
                             *ptr++ = tok;
                             tok = GETCHAR(parser);
-                        } while(   PARSER_STOP(tok, parser, ptr) 
+                        } while(   PARSER_STOP(tok, parser, ptr)
                                 && (isalnum(tok) || tok == '.'  || tok == '_' || tok == '-'));
 
                         PARSER_BUFFER_EXCEEDED(parser, ptr);
-                        
+
                         return tok_string;
                     }
@@ -161 +162 @@
                     digit &= (isdigit(tok) || (tok == '.'));
                     tok = GETCHAR(parser);
-                } while(   PARSER_STOP(tok, parser, ptr) 
+                } while(   PARSER_STOP(tok, parser, ptr)
                         && (isalnum(tok) || tok == '.' || tok == '_' || tok == '-'));
-                
+
                 PARSER_BUFFER_EXCEEDED(parser, ptr);
 
@@ -175 +176 @@
         } while(   PARSER_STOP(tok, parser, ptr)
                 && (isalnum(tok) || tok == ':' || tok == '.' || tok == '-' || tok == '_'));
-        
+
         PARSER_BUFFER_EXCEEDED(parser, ptr);
 
@@ -207 +208 @@
             tok = GETCHAR(parser);
         } while (tok != EOF && tok != '\r' && tok != '\n');
-        
+
         if (tok == EOF) return tok_eof;
 
@@ -239 +240 @@
     {
         struct rcp_state *st;
+        RTNETADDR *address;
+        char *str_address;
+
         Assert(parser->rcpp_state);
-        
+
         st = parser->rcpp_state;
-        RTNETADDR *address = &st->rcps_nameserver[st->rcps_num_nameserver];
-        char *str_address = &st->rcps_nameserver_str_buffer[st->rcps_num_nameserver * RCPS_IPVX_SIZE];
+        address = &st->rcps_nameserver[st->rcps_num_nameserver];
+        str_address = &st->rcps_nameserver_str_buffer[st->rcps_num_nameserver * RCPS_IPVX_SIZE];
 #ifdef RT_OS_DARWIN
         if (   tok == tok_ipv4_port
@@ -266 +270 @@
 
             strcpy(str_address, parser->rcpp_str_buffer);
-        
+
             st->rcps_str_nameserver[st->rcps_num_nameserver] = str_address;
 
@@ -279 +283 @@
                     int rc = RTNetStrToIPv4Addr(parser->rcpp_str_buffer, &address->uAddr.IPv4);
                     if (RT_FAILURE(rc)) return tok_error;
-                    
+
                     address->enmType = RTNETADDRTYPE_IPV4;
                 }
@@ -325 +329 @@
     st = parser->rcpp_state;
 
-    if (   tok != tok_number 
+    if (   tok != tok_number
         || tok == tok_eof)
         return tok_error;
@@ -349 +353 @@
 
     /**
-     * It's nowhere specified how resolver should react on dublicats 
+     * It's nowhere specified how resolver should react on dublicats
      * of 'domain' declarations, let's assume that resolv.conf is broken.
      */
@@ -359 +363 @@
     strcpy(st->rcps_domain_buffer, parser->rcpp_str_buffer);
     /**
-     * We initialize this pointer in place, just make single pointer check 
-     * in 'domain'-less resolv.conf. 
+     * We initialize this pointer in place, just make single pointer check
+     * in 'domain'-less resolv.conf.
      */
     st->rcps_domain = st->rcps_domain_buffer;
@@ -383 +387 @@
     Assert(parser->rcpp_state);
     st = parser->rcpp_state;
-    
+
     /**
-     * We asume that duplication of search list in resolv.conf isn't correct. 
+     * We asume that duplication of search list in resolv.conf isn't correct.
      */
     if (   tok == tok_eof
@@ -406 +410 @@
         trailing -= len + 1; /* 1 reserved for '\0' */
 
-        st->rcps_searchlist[i] = ptr; 
-
-    } while(  (tok = rcp_get_token(parser)) == tok_string 
+        st->rcps_searchlist[i] = ptr;
+
+    } while(  (tok = rcp_get_token(parser)) == tok_string
             && ++i != RCPS_MAX_SEARCHLIST);
 
@@ -420 +424 @@
  *      ::= portexpr | expr
  *      ::= domainexpr | expr
- *      ::= searchexpr | expr 
+ *      ::= searchexpr | expr
  *      ::= searchlistexpr | expr
  *      ::= search_orderexpr | expr
@@ -432 +436 @@
 
     while(   tok != tok_eof
-          && tok != tok_error) 
+          && tok != tok_error)
     {
         switch (tok)
@@ -476 +480 @@
 
     /**
-     * for debugging need: with RCP_STANDALONE it's possible 
+     * for debugging need: with RCP_STANDALONE it's possible
      * to run simplefied scenarious like
      *
-     * # cat /etc/resolv.conf | rcp-test-0 
+     * # cat /etc/resolv.conf | rcp-test-0
      * or in lldb
      * # process launch -i /etc/resolv.conf
@@ -501 +505 @@
         RTStrmClose(parser.rcpp_stream);
 
-    if (rc == -1) 
+    if (rc == -1)
         return -1;
 
@@ -512 +516 @@
         state->rcps_port = 53;
 
-    for(i = 0;  (state->rcps_flags & RCPSF_NO_STR2IPCONV) == 0 
+    for(i = 0;  (state->rcps_flags & RCPSF_NO_STR2IPCONV) == 0
              && i != RCPS_MAX_NAMESERVERS; ++i)
     {