ipcpd, lib, irmd: Update to use qoscube_t

6 files changed, 30 insertions, 29 deletions

diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 30d2d2bd..122beafb 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -217,10 +217,10 @@ static int ipcp_local_name_query(char * name)
         return ret;
 }
 
-static int ipcp_local_flow_alloc(int           fd,
-                                 char *        dst_name,
-                                 char *        src_ae_name,
-                                 enum qos_cube qos)
+static int ipcp_local_flow_alloc(int       fd,
+                                 char *    dst_name,
+                                 char *    src_ae_name,
+                                 qoscube_t qos)
 {
         int out_fd = -1;
 
diff --git a/src/ipcpd/shim-eth-llc/main.c b/src/ipcpd/shim-eth-llc/main.c
index c7e17ff6..fd25dcd9 100644
--- a/src/ipcpd/shim-eth-llc/main.c
+++ b/src/ipcpd/shim-eth-llc/main.c
@@ -932,10 +932,10 @@ static int eth_llc_ipcp_name_query(char * name)
         return ret;
 }
 
-static int eth_llc_ipcp_flow_alloc(int           fd,
-                                   char *        dst_name,
-                                   char *        src_ae_name,
-                                   enum qos_cube qos)
+static int eth_llc_ipcp_flow_alloc(int       fd,
+                                   char *    dst_name,
+                                   char *    src_ae_name,
+                                   qoscube_t qos)
 {
         uint8_t ssap = 0;
         uint8_t r_addr[MAC_SIZE];
diff --git a/src/ipcpd/shim-udp/main.c b/src/ipcpd/shim-udp/main.c
index fd321780..ea408914 100644
--- a/src/ipcpd/shim-udp/main.c
+++ b/src/ipcpd/shim-udp/main.c
@@ -945,10 +945,10 @@ static int ipcp_udp_name_query(char * name)
         return 0;
 }
 
-static int ipcp_udp_flow_alloc(int           fd,
-                               char *        dst_name,
-                               char *        src_ae_name,
-                               enum qos_cube qos)
+static int ipcp_udp_flow_alloc(int       fd,
+                               char *    dst_name,
+                               char *    src_ae_name,
+                               qoscube_t qos)
 {
         struct sockaddr_in r_saddr; /* server address */
         struct sockaddr_in f_saddr; /* flow */
diff --git a/src/irmd/ipcp.c b/src/irmd/ipcp.c
index 29327df4..aa5e4f8a 100644
--- a/src/irmd/ipcp.c
+++ b/src/irmd/ipcp.c
@@ -326,12 +326,12 @@ int ipcp_name_query(pid_t api,
         return ret;
 }
 
-int ipcp_flow_alloc(pid_t         api,
-                    int           port_id,
-                    pid_t         n_api,
-                    char *        dst_name,
-                    char *        src_ae_name,
-                    enum qos_cube qos)
+int ipcp_flow_alloc(pid_t     api,
+                    int       port_id,
+                    pid_t     n_api,
+                    char *    dst_name,
+                    char *    src_ae_name,
+                    qoscube_t qos)
 {
         ipcp_msg_t msg = IPCP_MSG__INIT;
         ipcp_msg_t * recv_msg = NULL;
diff --git a/src/irmd/ipcp.h b/src/irmd/ipcp.h
index 67b14ece..eb278e5b 100644
--- a/src/irmd/ipcp.h
+++ b/src/irmd/ipcp.h
@@ -42,17 +42,20 @@ int   ipcp_bootstrap(pid_t              api,
 
 int   ipcp_name_reg(pid_t  api,
                     char * name);
+
 int   ipcp_name_unreg(pid_t  api,
                       char * name);
+
 int   ipcp_name_query(pid_t api,
                       char * name);
 
-int   ipcp_flow_alloc(pid_t         api,
-                      int           port_id,
-                      pid_t         n_api,
-                      char *        dst_name,
-                      char *        src_ae_name,
-                      enum qos_cube qos);
+int   ipcp_flow_alloc(pid_t     api,
+                      int       port_id,
+                      pid_t     n_api,
+                      char *    dst_name,
+                      char *    src_ae_name,
+                      qoscube_t qos);
+
 int   ipcp_flow_alloc_resp(pid_t api,
                            int   port_id,
                            pid_t n_api,
diff --git a/src/lib/dev.c b/src/lib/dev.c
index bad56129..20976375 100644
--- a/src/lib/dev.c
+++ b/src/lib/dev.c
@@ -134,7 +134,7 @@ struct flow {
         struct shm_flow_set * set;
         int                   port_id;
         int                   oflags;
-        enum qos_cube         qos;
+        qoscube_t             qos;
 
         pid_t                 api;
 
@@ -654,9 +654,8 @@ int flow_dealloc(int fd)
         pthread_rwlock_unlock(&ai.data_lock);
 
         recv_msg = send_recv_irm_msg_b(&msg);
-        if (recv_msg == NULL) {
+        if (recv_msg == NULL)
                 return -1;
-        }
 
         if (!recv_msg->has_result) {
                 irm_msg__free_unpacked(recv_msg, NULL);
@@ -1435,11 +1434,10 @@ int ipcp_flow_fini(int fd)
         pthread_rwlock_unlock(&ai.data_lock);
 
         shm_rbuff_fini(rb);
-
         return 0;
 }
 
-int ipcp_flow_get_qoscube(int fd, enum qos_cube * cube)
+int ipcp_flow_get_qoscube(int fd, qoscube_t * cube)
 {
         if (fd < 0 || fd >= AP_MAX_FLOWS || cube == NULL)
                 return -EINVAL;