X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=vnet%2Fvnet%2Fipsec%2Fipsec_format.c;h=38aed79a1552f600a17491aa3d86df218d1261e8;hb=166a9d4c21821bdbc9a2d5a818ec5ae0e8bdc036;hp=f3720abf6c39b9e89fc90f83592899d9458e2cee;hpb=e2c987e21fa9d2d2be93176429679dd8eaca9576;p=vpp.git diff --git a/vnet/vnet/ipsec/ipsec_format.c b/vnet/vnet/ipsec/ipsec_format.c index f3720abf6c3..38aed79a155 100644 --- a/vnet/vnet/ipsec/ipsec_format.c +++ b/vnet/vnet/ipsec/ipsec_format.c @@ -26,15 +26,15 @@ u8 * format_ipsec_policy_action (u8 * s, va_list * args) { u32 i = va_arg (*args, u32); - char * t = 0; + char *t = 0; switch (i) { #define _(v,f,str) case IPSEC_POLICY_ACTION_##f: t = str; break; - foreach_ipsec_policy_action + foreach_ipsec_policy_action #undef _ - default: - s = format (s, "unknown"); + default: + s = format (s, "unknown"); } s = format (s, "%s", t); return s; @@ -43,13 +43,13 @@ format_ipsec_policy_action (u8 * s, va_list * args) uword unformat_ipsec_policy_action (unformat_input_t * input, va_list * args) { - u32 * r = va_arg (*args, u32 *); + u32 *r = va_arg (*args, u32 *); - if (0) ; + if (0); #define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_POLICY_ACTION_##f; foreach_ipsec_policy_action #undef _ - else + else return 0; return 1; } @@ -58,15 +58,15 @@ u8 * format_ipsec_crypto_alg (u8 * s, va_list * args) { u32 i = va_arg (*args, u32); - u8 * t = 0; + u8 *t = 0; switch (i) { #define _(v,f,str) case IPSEC_CRYPTO_ALG_##f: t = (u8 *) str; break; - foreach_ipsec_crypto_alg + foreach_ipsec_crypto_alg #undef _ - default: - s = format (s, "unknown"); + default: + s = format (s, "unknown"); } s = format (s, "%s", t); return s; @@ -75,13 +75,13 @@ format_ipsec_crypto_alg (u8 * s, va_list * args) uword unformat_ipsec_crypto_alg (unformat_input_t * input, va_list * args) { - u32 * r = va_arg (*args, u32 *); + u32 *r = va_arg (*args, u32 *); - if (0) ; + if (0); #define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_CRYPTO_ALG_##f; foreach_ipsec_crypto_alg #undef _ - else + else return 0; return 1; } @@ -90,15 +90,15 @@ u8 * format_ipsec_integ_alg (u8 * s, va_list * args) { u32 i = va_arg (*args, u32); - u8 * t = 0; + u8 *t = 0; switch (i) { #define _(v,f,str) case IPSEC_INTEG_ALG_##f: t = (u8 *) str; break; - foreach_ipsec_integ_alg + foreach_ipsec_integ_alg #undef _ - default: - s = format (s, "unknown"); + default: + s = format (s, "unknown"); } s = format (s, "%s", t); return s; @@ -107,27 +107,35 @@ format_ipsec_integ_alg (u8 * s, va_list * args) uword unformat_ipsec_integ_alg (unformat_input_t * input, va_list * args) { - u32 * r = va_arg (*args, u32 *); + u32 *r = va_arg (*args, u32 *); - if (0) ; + if (0); #define _(v,f,s) else if (unformat (input, s)) *r = IPSEC_INTEG_ALG_##f; foreach_ipsec_integ_alg #undef _ - else + else return 0; return 1; } u8 * -format_ipsec_replay_window(u8 * s, va_list * args) +format_ipsec_replay_window (u8 * s, va_list * args) { u64 w = va_arg (*args, u64); u8 i; for (i = 0; i < 64; i++) { - s = format (s, "%u", w & (1ULL<