diff options
Diffstat (limited to 'vlib-api')
| -rw-r--r-- | vlib-api/vlibapi/api_shared.c | 16 | ||||
| -rw-r--r-- | vlib-api/vlibapi/node_serialize.c | 8 | ||||
| -rw-r--r-- | vlib-api/vlibmemory/memory_vlib.c | 10 | ||||
| -rw-r--r-- | vlib-api/vlibsocket/sockclnt_vlib.c | 4 | ||||
| -rw-r--r-- | vlib-api/vlibsocket/socksvr_vlib.c | 2 |
5 files changed, 21 insertions, 19 deletions
diff --git a/vlib-api/vlibapi/api_shared.c b/vlib-api/vlibapi/api_shared.c index fd23c458946..c62ac5b18a5 100644 --- a/vlib-api/vlibapi/api_shared.c +++ b/vlib-api/vlibapi/api_shared.c @@ -781,7 +781,7 @@ vl_msg_api_process_file (vlib_main_t * vm, u8 * filename, if (!(statb.st_mode & S_IFREG) || (statb.st_size < sizeof (*hp))) { vlib_cli_output (vm, "File not plausible: %s\n", filename); - close(fd); + close (fd); return; } @@ -1084,17 +1084,19 @@ api_trace_command_fn (vlib_main_t * vm, rv = vl_msg_api_trace_save (am, which, fp); fclose (fp); if (rv == -1) - vlib_cli_output (vm, "API Trace data not present\n"); + vlib_cli_output (vm, "API Trace data not present\n"); else if (rv == -2) - vlib_cli_output (vm, "File for writing is closed\n"); + vlib_cli_output (vm, "File for writing is closed\n"); else if (rv == -10) - vlib_cli_output (vm, "Error while writing header to file\n"); + vlib_cli_output (vm, "Error while writing header to file\n"); else if (rv == -11) - vlib_cli_output (vm, "Error while writing trace to file\n"); + vlib_cli_output (vm, "Error while writing trace to file\n"); else if (rv == -12) - vlib_cli_output (vm, "Error while writing end of buffer trace to file\n"); + vlib_cli_output (vm, + "Error while writing end of buffer trace to file\n"); else if (rv == -13) - vlib_cli_output (vm, "Error while writing start of buffer trace to file\n"); + vlib_cli_output (vm, + "Error while writing start of buffer trace to file\n"); else if (rv < 0) vlib_cli_output (vm, "Unkown error while saving: %d", rv); else diff --git a/vlib-api/vlibapi/node_serialize.c b/vlib-api/vlibapi/node_serialize.c index b1e4ae18697..4dc1a7d2272 100644 --- a/vlib-api/vlibapi/node_serialize.c +++ b/vlib-api/vlibapi/node_serialize.c @@ -356,10 +356,10 @@ test_node_serialize_command_fn (vlib_main_t * vm, for (k = 0; k < vec_len (node->next_nodes); k++) { if (node->next_nodes[k] != ~0) - { - next_node = nodes[node->next_nodes[k]]; - vlib_cli_output (vm, " [%d] %s", k, next_node->name); - } + { + next_node = nodes[node->next_nodes[k]]; + vlib_cli_output (vm, " [%d] %s", k, next_node->name); + } } } } diff --git a/vlib-api/vlibmemory/memory_vlib.c b/vlib-api/vlibmemory/memory_vlib.c index 13b1121a0f4..68752745d66 100644 --- a/vlib-api/vlibmemory/memory_vlib.c +++ b/vlib-api/vlibmemory/memory_vlib.c @@ -1043,11 +1043,11 @@ vl_api_trace_print_file_cmd (vlib_main_t * vm, u32 first, u32 last, msg_id = ntohs (msg_id); if (fseek (fp, -2, SEEK_CUR) < 0) - { - vlib_cli_output (vm, "fseek failed, %s", strerror(errno)); - fclose(fp); - return; - } + { + vlib_cli_output (vm, "fseek failed, %s", strerror (errno)); + fclose (fp); + return; + } /* Mild sanity check */ if (msg_id >= vec_len (am->msg_handlers)) diff --git a/vlib-api/vlibsocket/sockclnt_vlib.c b/vlib-api/vlibsocket/sockclnt_vlib.c index e8d749c58d4..e16adfeb503 100644 --- a/vlib-api/vlibsocket/sockclnt_vlib.c +++ b/vlib-api/vlibsocket/sockclnt_vlib.c @@ -107,7 +107,7 @@ sockclnt_open_index (char *client_name, char *hostname, int port) if (connect (sockfd, (const void *) &serv_addr, sizeof (serv_addr)) < 0) { clib_unix_warning ("Connect failure to (%s, %d)", hostname, port); - close(sockfd); + close (sockfd); return ~0; } @@ -115,7 +115,7 @@ sockclnt_open_index (char *client_name, char *hostname, int port) if (rv < 0) { clib_unix_warning ("FIONBIO"); - close(sockfd); + close (sockfd); return ~0; } diff --git a/vlib-api/vlibsocket/socksvr_vlib.c b/vlib-api/vlibsocket/socksvr_vlib.c index 354c4f1c53d..dc8c63ebbaf 100644 --- a/vlib-api/vlibsocket/socksvr_vlib.c +++ b/vlib-api/vlibsocket/socksvr_vlib.c @@ -611,7 +611,7 @@ socksvr_api_init (vlib_main_t * vm) rv = listen (sockfd, 5); if (rv < 0) { - close(sockfd); + close (sockfd); return clib_error_return_unix (0, "listen"); } |