remove trailing whitespaces
[dpdk.git] / lib / librte_cmdline / cmdline_parse_ipaddr.h
index 35cc915..0e2f490 100644 (file)
@@ -1,35 +1,34 @@
 /*-
  *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *
+ *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
- *   Redistribution and use in source and binary forms, with or without 
- *   modification, are permitted provided that the following conditions 
+ *
+ *   Redistribution and use in source and binary forms, with or without
+ *   modification, are permitted provided that the following conditions
  *   are met:
- * 
- *     * Redistributions of source code must retain the above copyright 
+ *
+ *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above copyright 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * Neither the name of Intel Corporation nor the names of its
+ *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
- *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS 
- *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT 
- *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *
+ *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
 /*
@@ -97,93 +96,87 @@ int cmdline_parse_ipaddr(cmdline_parse_token_hdr_t *tk, const char *srcbuf,
 int cmdline_get_help_ipaddr(cmdline_parse_token_hdr_t *tk, char *dstbuf,
                            unsigned int size);
 
-/*
- * Warning! Not compatible with C++!
- */
-#define TOKEN_IPADDR_INITIALIZER(structure, field)         \
-{                                                          \
-       .hdr = {                                            \
-               .ops = &cmdline_token_ipaddr_ops,           \
-               .offset = offsetof(structure, field),       \
-       },                                                  \
-       .ipaddr_data = {                                    \
-               .flags = CMDLINE_IPADDR_V4 |                \
-               CMDLINE_IPADDR_V6,                          \
-       },                                                  \
+#define TOKEN_IPADDR_INITIALIZER(structure, field)      \
+{                                                       \
+       /* hdr */                                           \
+       {                                                   \
+               &cmdline_token_ipaddr_ops,      /* ops */       \
+               offsetof(structure, field),     /* offset */    \
+       },                                                  \
+       /* ipaddr_data */                                   \
+       {                                                   \
+               CMDLINE_IPADDR_V4 |             /* flags */     \
+               CMDLINE_IPADDR_V6,                              \
+       },                                                  \
 }
 
-/*
- * Warning! Not compatible with C++!
- */
-#define TOKEN_IPV4_INITIALIZER(structure, field)           \
-{                                                          \
-       .hdr = {                                            \
-               .ops = &cmdline_token_ipaddr_ops,           \
-               .offset = offsetof(structure, field),       \
-       },                                                  \
-       .ipaddr_data = {                                    \
-               .flags = CMDLINE_IPADDR_V4,                 \
-       },                                                  \
+#define TOKEN_IPV4_INITIALIZER(structure, field)        \
+{                                                       \
+       /* hdr */                                           \
+       {                                                   \
+               &cmdline_token_ipaddr_ops,      /* ops */       \
+               offsetof(structure, field),     /* offset */    \
+       },                                                  \
+       /* ipaddr_data */                                   \
+       {                                                   \
+               CMDLINE_IPADDR_V4,              /* flags */     \
+       },                                                  \
 }
 
-/*
- * Warning! Not compatible with C++!
- */
-#define TOKEN_IPV6_INITIALIZER(structure, field)           \
-{                                                          \
-       .hdr = {                                            \
-               .ops = &cmdline_token_ipaddr_ops,           \
-               .offset = offsetof(structure, field),       \
-       },                                                  \
-       .ipaddr_data = {                                    \
-               .flags = CMDLINE_IPADDR_V6,                 \
-       },                                                  \
+#define TOKEN_IPV6_INITIALIZER(structure, field)        \
+{                                                       \
+       /* hdr */                                           \
+       {                                                   \
+               &cmdline_token_ipaddr_ops,      /* ops */       \
+               offsetof(structure, field),     /* offset */    \
+       },                                                  \
+       /* ipaddr_data */                                   \
+       {                                                   \
+               CMDLINE_IPADDR_V6,              /* flags */     \
+       },                                                  \
 }
 
-/*
- * Warning! Not compatible with C++!
- */
-#define TOKEN_IPNET_INITIALIZER(structure, field)          \
-{                                                          \
-       .hdr = {                                            \
-               .ops = &cmdline_token_ipaddr_ops,           \
-               .offset = offsetof(structure, field),       \
-       },                                                  \
-       .ipaddr_data = {                                    \
-               .flags = CMDLINE_IPADDR_V4 |                \
-               CMDLINE_IPADDR_V6 |                         \
-               CMDLINE_IPADDR_NETWORK,                     \
-       },                                                  \
+#define TOKEN_IPNET_INITIALIZER(structure, field)       \
+{                                                       \
+       /* hdr */                                           \
+       {                                                   \
+               &cmdline_token_ipaddr_ops,      /* ops */       \
+               offsetof(structure, field),     /* offset */    \
+       },                                                  \
+       /* ipaddr_data */                                   \
+       {                                                   \
+               CMDLINE_IPADDR_V4 |             /* flags */     \
+               CMDLINE_IPADDR_V6 |                             \
+               CMDLINE_IPADDR_NETWORK,                         \
+       },                                                  \
 }
 
-/*
- * Warning! Not compatible with C++!
- */
-#define TOKEN_IPV4NET_INITIALIZER(structure, field)        \
-{                                                          \
-       .hdr = {                                            \
-               .ops = &cmdline_token_ipaddr_ops,           \
-               .offset = offsetof(structure, field),       \
-       },                                                  \
-       .ipaddr_data = {                                    \
-               .flags = CMDLINE_IPADDR_V4 |                \
-               CMDLINE_IPADDR_NETWORK,                     \
-       },                                                  \
+#define TOKEN_IPV4NET_INITIALIZER(structure, field)     \
+{                                                       \
+       /* hdr */                                           \
+       {                                                   \
+               &cmdline_token_ipaddr_ops,      /* ops */       \
+               offsetof(structure, field),     /* offset */    \
+       },                                                  \
+       /* ipaddr_data */                                   \
+       {                                                   \
+               CMDLINE_IPADDR_V4 |             /* flags */     \
+               CMDLINE_IPADDR_NETWORK,                         \
+       },                                                  \
 }
 
-/*
- * Warning! Not compatible with C++!
- */
-#define TOKEN_IPV6NET_INITIALIZER(structure, field)        \
-{                                                          \
-       .hdr = {                                            \
-               .ops = &cmdline_token_ipaddr_ops,           \
-               .offset = offsetof(structure, field),       \
-       },                                                  \
-       .ipaddr_data = {                                    \
-               .flags = CMDLINE_IPADDR_V4 |                \
-               CMDLINE_IPADDR_NETWORK,                     \
-       },                                                  \
+#define TOKEN_IPV6NET_INITIALIZER(structure, field)     \
+{                                                       \
+       /* hdr */                                           \
+       {                                                   \
+               &cmdline_token_ipaddr_ops,      /* ops */       \
+               offsetof(structure, field),     /* offset */    \
+       },                                                  \
+       /* ipaddr_data */                                   \
+       {                                                   \
+               CMDLINE_IPADDR_V4 |             /* flags */     \
+               CMDLINE_IPADDR_NETWORK,                         \
+       },                                                  \
 }
 
 #ifdef __cplusplus