1 files changed, 41 insertions, 61 deletions

diff --git a/ctrl/libhicnctrl/src/route.c b/ctrl/libhicnctrl/src/route.c
index 703b4763f..f59dbce7c 100644
--- a/ctrl/libhicnctrl/src/route.c
+++ b/ctrl/libhicnctrl/src/route.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2019 Cisco and/or its affiliates.
+ * Copyright (c) 2021 Cisco and/or its affiliates.
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
  * You may obtain a copy of the License at:
@@ -25,84 +25,64 @@
 #define DEFAULT_HICN_ROUTE_COST 1
 
 struct hicn_route_s {
-    ip_prefix_t prefix;
-    face_id_t face_id;
-    route_cost_t cost; /* Optional, 0 means no value, defaults to 1 */
+  ip_prefix_t prefix;
+  face_id_t face_id;
+  route_cost_t cost; /* Optional, 0 means no value, defaults to 1 */
 };
 
-hicn_route_t *
-hicn_route_create(ip_prefix_t * prefix, face_id_t face_id, route_cost_t cost)
-{
-    hicn_route_t * route = malloc(sizeof(hicn_route_t));
-    if (!route)
-        return NULL;
-    route->prefix = *prefix;
-    route->face_id = face_id;
-    route->cost = cost != 0 ? cost : DEFAULT_HICN_ROUTE_COST;
+hicn_route_t* hicn_route_create(ip_prefix_t* prefix, face_id_t face_id,
+                                route_cost_t cost) {
+  hicn_route_t* route = malloc(sizeof(hicn_route_t));
+  if (!route) return NULL;
+  route->prefix = *prefix;
+  route->face_id = face_id;
+  route->cost = cost != 0 ? cost : DEFAULT_HICN_ROUTE_COST;
 
-    return route;
+  return route;
 }
 
-hicn_route_t *
-hicn_route_dup(const hicn_route_t * route)
-{
-    hicn_route_t * new_route = malloc(sizeof(hicn_route_t));
-    if (!route)
-        return NULL;
-    memcpy(new_route, route, sizeof(hicn_route_t));
-    return new_route;
+hicn_route_t* hicn_route_dup(const hicn_route_t* route) {
+  hicn_route_t* new_route = malloc(sizeof(hicn_route_t));
+  if (!route) return NULL;
+  memcpy(new_route, route, sizeof(hicn_route_t));
+  return new_route;
 }
 
-void hicn_route_free(hicn_route_t * route)
-{
-    free(route);
-}
+void hicn_route_free(hicn_route_t* route) { free(route); }
 
-int
-hicn_route_cmp(const hicn_route_t * route1, const hicn_route_t * route2)
-{
-    int rc;
-    rc = ip_prefix_cmp(&route1->prefix, &route2->prefix);
-    if (rc != 0)
-        return rc;
+int hicn_route_cmp(const hicn_route_t* route1, const hicn_route_t* route2) {
+  int rc;
+  rc = ip_prefix_cmp(&route1->prefix, &route2->prefix);
+  if (rc != 0) return rc;
 
-    return (route1->face_id > route2->face_id) ?  1 :
-           (route1->face_id < route2->face_id) ? -1 : 0;
+  return (route1->face_id > route2->face_id)   ? 1
+         : (route1->face_id < route2->face_id) ? -1
+                                               : 0;
 }
 
-int
-hicn_route_get_prefix(const hicn_route_t * route, ip_prefix_t * prefix)
-{
-    *prefix = route->prefix;
-    return 0;
+int hicn_route_get_prefix(const hicn_route_t* route, ip_prefix_t* prefix) {
+  *prefix = route->prefix;
+  return 0;
 }
 
-int
-hicn_route_set_prefix(hicn_route_t * route, const ip_prefix_t prefix)
-{
-    route->prefix = prefix;
-    return 0;
+int hicn_route_set_prefix(hicn_route_t* route, const ip_prefix_t prefix) {
+  route->prefix = prefix;
+  return 0;
 }
 
-int
-hicn_route_get_cost(const hicn_route_t * route, int * cost)
-{
-    *cost = route->cost;
-    return 0;
+int hicn_route_get_cost(const hicn_route_t* route, int* cost) {
+  *cost = route->cost;
+  return 0;
 }
 
-int
-hicn_route_set_cost(hicn_route_t * route, const int cost)
-{
-    route->cost = cost;
-    return 0;
+int hicn_route_set_cost(hicn_route_t* route, const int cost) {
+  route->cost = cost;
+  return 0;
 }
 
 /* /!\ Please update constants in header file upon changes */
-size_t
-hicn_route_snprintf(char * s, size_t size, const hicn_route_t * route)
-{
-    char prefix_s[MAXSZ_PREFIX];
-    ip_prefix_ntop(&route->prefix, prefix_s, MAXSZ_PREFIX);
-    return snprintf(s, size, "%s [%d]", prefix_s, route->cost);
+size_t hicn_route_snprintf(char* s, size_t size, const hicn_route_t* route) {
+  char prefix_s[MAXSZ_IP_PREFIX];
+  ip_prefix_ntop(&route->prefix, prefix_s, MAXSZ_IP_PREFIX);
+  return snprintf(s, size, "%s [%d]", prefix_s, route->cost);
 }