Merge pull request #12931 from SaiGomathiN/yang

[mirror_frr.git] / qpb / qpb.h

diff --git a/qpb/qpb.h b/qpb/qpb.h
index fb5f56ac30a9b8cd4864356ab31d0cfebcd4ba35..d52528f41b83e31769be011ff307253af8a7981d 100644 (file)
--- a/qpb/qpb.h
+++ b/qpb/qpb.h
@@ -1,25 +1,10 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
 /*
  * qpb.h
  *
  * @copyright Copyright (C) 2016 Sproute Networks, Inc.
  *
  * @author Avneesh Sachdev <avneesh@sproute.com>
- *
- * This file is part of Quagga.
- *
- * Quagga is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
- *
- * Quagga is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; see the file COPYING; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 /*
@@ -40,7 +25,7 @@
  */
 #define qpb_address_family_set qpb__address_family__set
 static inline int qpb__address_family__set(Qpb__AddressFamily *pb_family,
-                                          u_char family)
+                                          uint8_t family)
 {
        switch (family) {
        case AF_INET:
@@ -63,7 +48,7 @@ static inline int qpb__address_family__set(Qpb__AddressFamily *pb_family,
  */
 #define qpb_address_family_get qpb__address_family__get
 static inline int qpb__address_family__get(Qpb__AddressFamily pb_family,
-                                          u_char *family)
+                                          uint8_t *family)
 {
 
        switch (pb_family) {
@@ -77,7 +62,7 @@ static inline int qpb__address_family__get(Qpb__AddressFamily pb_family,
 
        case QPB__ADDRESS_FAMILY__UNKNOWN_AF:
                return 0;
-       default: /* protobuf "magic value" _QPB__ADDRESS_FAMILY_IS_INT_SIZE */
+       case _QPB__ADDRESS_FAMILY_IS_INT_SIZE:
                return 0;
        }
 
@@ -115,17 +100,19 @@ static inline Qpb__L3Prefix *qpb__l3_prefix__create(qpb_allocator_t *allocator,
  */
 #define qpb_l3_prefix_get qpb__l3_prefix__get
 static inline int qpb__l3_prefix__get(const Qpb__L3Prefix *pb_prefix,
-                                     u_char family, struct prefix *prefix)
+                                     uint8_t family, struct prefix *prefix)
 {
 
        switch (family) {
 
        case AF_INET:
-               memset(prefix, 0, sizeof(struct prefix_ipv4));
+               memset((struct prefix_ipv4 *)prefix, 0,
+                      sizeof(struct prefix_ipv4));
                break;
 
        case AF_INET6:
-               memset(prefix, 0, sizeof(struct prefix_ipv6));
+               memset((struct prefix_ipv6 *)prefix, 0,
+                      sizeof(struct prefix_ipv6));
                break;
 
        default:
@@ -262,7 +249,7 @@ static inline int qpb__ipv6_address__get(const Qpb__Ipv6Address *v6,
 #define qpb_l3_address_create qpb__l3_address__create
 static inline Qpb__L3Address *
 qpb__l3_address__create(qpb_allocator_t *allocator, union g_addr *addr,
-                       u_char family)
+                       uint8_t family)
 {
        Qpb__L3Address *l3_addr;
 
@@ -298,7 +285,7 @@ qpb__l3_address__create(qpb_allocator_t *allocator, union g_addr *addr,
  */
 #define qpb_l3_address_get qpb__l3_address__get
 static inline int qpb__l3_address__get(const Qpb__L3Address *l3_addr,
-                                      u_char *family, union g_addr *addr)
+                                      uint8_t *family, union g_addr *addr)
 {
        if (l3_addr->v4) {
                qpb__ipv4_address__get(l3_addr->v4, &addr->ipv4);