From c379999665febd12ec55bfb3a7545224f2b39d3d Mon Sep 17 00:00:00 2001 From: Dave Barach Date: Mon, 15 Aug 2016 11:12:27 -0400 Subject: VPP-327 Coding standards cleanup for vppinfra Fix additional a few additional deviations reported elsewhere by checkstyle Change-Id: I026a8ae1c5b1856bbe3c4a555e1b690e7501b045 Signed-off-by: Dave Barach --- vpp/vpp-api/api.c | 34 +++++++++++++++++----------------- vpp/vpp-api/gmon.c | 4 ++-- 2 files changed, 19 insertions(+), 19 deletions(-) (limited to 'vpp/vpp-api') diff --git a/vpp/vpp-api/api.c b/vpp/vpp-api/api.c index ee3ced43..788e310e 100644 --- a/vpp/vpp-api/api.c +++ b/vpp/vpp-api/api.c @@ -8111,7 +8111,7 @@ VLIB_INIT_FUNCTION (vpe_api_init); static clib_error_t * api_segment_config (vlib_main_t * vm, unformat_input_t * input) { - u8 * chroot_path; + u8 *chroot_path; u64 baseva, size, pvt_heap_size; int uid, gid, rv; const int max_buf_size = 4096; @@ -8130,31 +8130,31 @@ api_segment_config (vlib_main_t * vm, unformat_input_t * input) else if (unformat (input, "uid %d", &uid)) vl_set_memory_uid (uid); else if (unformat (input, "gid %d", &gid)) - vl_set_memory_gid (gid); + vl_set_memory_gid (gid); else if (unformat (input, "baseva %llx", &baseva)) - vl_set_global_memory_baseva (baseva); + vl_set_global_memory_baseva (baseva); else if (unformat (input, "global-size %lldM", &size)) - vl_set_global_memory_size (size * (1ULL<<20)); + vl_set_global_memory_size (size * (1ULL << 20)); else if (unformat (input, "global-size %lldG", &size)) - vl_set_global_memory_size (size * (1ULL<<30)); + vl_set_global_memory_size (size * (1ULL << 30)); else if (unformat (input, "global-size %lld", &size)) - vl_set_global_memory_size (size); + vl_set_global_memory_size (size); else if (unformat (input, "global-pvt-heap-size %lldM", &pvt_heap_size)) - vl_set_global_pvt_heap_size (pvt_heap_size * (1ULL<<20)); - else if (unformat (input, "global-pvt-heap-size size %lld", - &pvt_heap_size)) - vl_set_global_pvt_heap_size (pvt_heap_size); + vl_set_global_pvt_heap_size (pvt_heap_size * (1ULL << 20)); + else if (unformat (input, "global-pvt-heap-size size %lld", + &pvt_heap_size)) + vl_set_global_pvt_heap_size (pvt_heap_size); else if (unformat (input, "api-pvt-heap-size %lldM", &pvt_heap_size)) - vl_set_api_pvt_heap_size (pvt_heap_size * (1ULL<<20)); - else if (unformat (input, "api-pvt-heap-size size %lld", - &pvt_heap_size)) - vl_set_api_pvt_heap_size (pvt_heap_size); + vl_set_api_pvt_heap_size (pvt_heap_size * (1ULL << 20)); + else if (unformat (input, "api-pvt-heap-size size %lld", + &pvt_heap_size)) + vl_set_api_pvt_heap_size (pvt_heap_size); else if (unformat (input, "api-size %lldM", &size)) - vl_set_api_memory_size (size * (1ULL<<20)); + vl_set_api_memory_size (size * (1ULL << 20)); else if (unformat (input, "api-size %lldG", &size)) - vl_set_api_memory_size (size * (1ULL<<30)); + vl_set_api_memory_size (size * (1ULL << 30)); else if (unformat (input, "api-size %lld", &size)) - vl_set_api_memory_size (size); + vl_set_api_memory_size (size); else if (unformat (input, "uid %s", &s)) { /* lookup the username */ diff --git a/vpp/vpp-api/gmon.c b/vpp/vpp-api/gmon.c index 330dc9fe..e5cb1271 100644 --- a/vpp/vpp-api/gmon.c +++ b/vpp/vpp-api/gmon.c @@ -180,8 +180,8 @@ gmon_init (vlib_main_t * vm) if ((error = vlib_call_init_function (vm, vpe_api_init))) return (error); - if ((error = vlib_call_init_function(vm, vlibmemory_init))) - return(error); + if ((error = vlib_call_init_function (vm, vlibmemory_init))) + return (error); gm->vlib_main = vm; -- cgit 1.2.3-korg