From 99d19307fae8f1370f52a62aee88fded624ad464 Mon Sep 17 00:00:00 2001
From: Sander Vrijders <sander.vrijders@intec.ugent.be>
Date: Tue, 28 Jun 2016 16:38:03 +0200
Subject: lib, irmd, ipcpd: Change pid to api

Changes the variable name as well to API instead of PID.
---
 src/ipcpd/local/main.c | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/ipcpd/local/main.c')

diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index 1f1cf839..2120e4e8 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -50,7 +50,7 @@
 #define shim_data(type) ((struct ipcp_local_data *) type->data)
 
 /* global for trapping signal */
-int irmd_pid;
+int irmd_api;
 
 /* this IPCP's data */
 #ifdef MAKE_CHECK
@@ -226,7 +226,7 @@ void ipcp_sig_handler(int sig, siginfo_t * info, void * c)
         case SIGTERM:
         case SIGHUP:
         case SIGQUIT:
-                if (info->si_pid == irmd_pid) {
+                if (info->si_pid == irmd_api) {
                         bool clean_threads = false;
                         LOG_DBG("Terminating by order of %d. Bye.",
                                 info->si_pid);
@@ -276,7 +276,7 @@ static int ipcp_local_bootstrap(struct dif_config * conf)
 
         pthread_rwlock_unlock(&_ipcp->state_lock);
 
-        LOG_DBG("Bootstrapped local IPCP with pid %d.",
+        LOG_DBG("Bootstrapped local IPCP with api %d.",
                 getpid());
 
         return 0;
@@ -320,7 +320,7 @@ static int ipcp_local_name_unreg(char * name)
         return 0;
 }
 
-static int ipcp_local_flow_alloc(pid_t         n_pid,
+static int ipcp_local_flow_alloc(pid_t         n_api,
                                  int           port_id,
                                  char *        dst_name,
                                  char *        src_ae_name,
@@ -346,7 +346,7 @@ static int ipcp_local_flow_alloc(pid_t         n_pid,
                 return -1; /* -ENOTENROLLED */
         }
 
-        rb = shm_ap_rbuff_open(n_pid);
+        rb = shm_ap_rbuff_open(n_api);
         if (rb == NULL) {
                 pthread_rwlock_unlock(&_ipcp->state_lock);
                 return -1; /* -ENORBUFF */
@@ -376,13 +376,13 @@ static int ipcp_local_flow_alloc(pid_t         n_pid,
                 pthread_rwlock_unlock(&_ap_instance->flows_lock);
                 pthread_rwlock_unlock(&_ipcp->state_lock);
                 LOG_ERR("Could not get port id from IRMd");
-                /* shm_ap_rbuff_close(n_pid); */
+                /* shm_ap_rbuff_close(n_api); */
                 return -1;
         }
 
         out_fd = bmp_allocate(_ap_instance->fds);
         if (!bmp_is_id_valid(_ap_instance->fds, out_fd)) {
-                /* shm_ap_rbuff_close(n_pid); */
+                /* shm_ap_rbuff_close(n_api); */
                 pthread_rwlock_unlock(&_ap_instance->flows_lock);
                 pthread_rwlock_unlock(&_ipcp->state_lock);
                 return -1; /* -ENOMOREFDS */
@@ -403,7 +403,7 @@ static int ipcp_local_flow_alloc(pid_t         n_pid,
         return 0;
 }
 
-static int ipcp_local_flow_alloc_resp(pid_t n_pid,
+static int ipcp_local_flow_alloc_resp(pid_t n_api,
                                       int   port_id,
                                       int   response)
 {
@@ -436,7 +436,7 @@ static int ipcp_local_flow_alloc_resp(pid_t n_pid,
                 return -1;
         }
 
-        rb = shm_ap_rbuff_open(n_pid);
+        rb = shm_ap_rbuff_open(n_api);
         if (rb == NULL) {
                 LOG_ERR("Could not open N + 1 ringbuffer.");
                 _ap_instance->flows[in_fd].state   = FLOW_NULL;
@@ -592,7 +592,7 @@ int main (int argc, char * argv[])
                 exit(1);
 
         /* store the process id of the irmd */
-        irmd_pid = atoi(argv[1]);
+        irmd_api = atoi(argv[1]);
 
         /* init sig_act */
         memset(&sig_act, 0, sizeof(sig_act));
-- 
cgit v1.2.3