summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordimitri staessens <dimitri.staessens@intec.ugent.be>2016-06-14 14:52:26 +0200
committerdimitri staessens <dimitri.staessens@intec.ugent.be>2016-06-14 14:52:26 +0200
commit95124310f647913a678060fc10155a0ad9311dba (patch)
treea1c2a7bd200eb0343557524ddc80b0af6df4ec9e
parentbe68864173cf12d9998e4dbe73d876d8974a2ec1 (diff)
downloadouroboros-95124310f647913a678060fc10155a0ad9311dba.tar.gz
ouroboros-95124310f647913a678060fc10155a0ad9311dba.zip
Fixed comments on #122
-rw-r--r--src/ipcpd/local/main.c2
-rw-r--r--src/irmd/main.c7
-rw-r--r--src/tools/cbr/cbr.c2
3 files changed, 4 insertions, 7 deletions
diff --git a/src/ipcpd/local/main.c b/src/ipcpd/local/main.c
index e7db58b6..6357487f 100644
--- a/src/ipcpd/local/main.c
+++ b/src/ipcpd/local/main.c
@@ -520,7 +520,7 @@ static int ipcp_local_flow_dealloc(int port_id)
bmp_release(_ap_instance->fds, fd);
if (_ap_instance->in_out[fd] != -1)
- _ap_instance->in_out[_ap_instance->in_out[fd]] =-1;
+ _ap_instance->in_out[_ap_instance->in_out[fd]] = -1;
_ap_instance->in_out[fd] = -1;
diff --git a/src/irmd/main.c b/src/irmd/main.c
index fc856687..db96b6ed 100644
--- a/src/irmd/main.c
+++ b/src/irmd/main.c
@@ -705,7 +705,7 @@ static int ap_reg(char * name,
/* we need to duplicate argv */
if (argc != 0) {
- argv_dup = malloc ((argc + 2) * sizeof(*argv_dup));
+ argv_dup = malloc((argc + 2) * sizeof(*argv_dup));
argv_dup[0] = strdup(api->name);
for (i = 1; i <= argc; ++i)
argv_dup[i] = strdup(argv[i - 1]);
@@ -1108,7 +1108,7 @@ static int auto_execute(char * ap, char ** argv)
execv(ap, argv);
- LOG_DBG("Failed to execute.");
+ LOG_ERR("Failed to execute.");
exit(EXIT_FAILURE);
return 0;
@@ -1161,8 +1161,7 @@ static struct port_map_entry * flow_req_arr(pid_t pid,
while (rne->accept == false)
pthread_cond_wait(&rne->acc_signal,
&rne->acc_lock);
- }
- else {
+ } else {
pthread_mutex_unlock(&rne->acc_lock);
LOG_WARN("%s is not accepting flow allocations.",
rne->name);
diff --git a/src/tools/cbr/cbr.c b/src/tools/cbr/cbr.c
index 750b5a15..ab178ca3 100644
--- a/src/tools/cbr/cbr.c
+++ b/src/tools/cbr/cbr.c
@@ -132,9 +132,7 @@ int main(int argc, char ** argv)
if (server) {
ret = server_main();
-
} else {
-
if (s_apn == NULL) {
printf("No server specified.\n");
usage();