From 18893237e662527792ea719170209fb1ad433726 Mon Sep 17 00:00:00 2001 From: Michael Tuexen <tuexen@fh-muenster.de> Date: Mon, 21 Sep 2015 22:01:52 +0200 Subject: [PATCH] Use tabs instead of spaces. --- gtests/net/packetdrill/run_system_call.c | 62 ++++++++++++------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/gtests/net/packetdrill/run_system_call.c b/gtests/net/packetdrill/run_system_call.c index d6096200..d1ff8c59 100644 --- a/gtests/net/packetdrill/run_system_call.c +++ b/gtests/net/packetdrill/run_system_call.c @@ -1579,15 +1579,15 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall, if (get_s32(syscall->result, &expected, error)) return STATUS_ERR; val_expression = get_arg(args, 3, error); - if (val_expression == NULL) { - return STATUS_ERR; + if (val_expression == NULL) { + return STATUS_ERR; } else if (val_expression->type == EXPR_LINGER) { live_optval = (void *) malloc(sizeof(val_expression->value.linger)); - live_optlen = sizeof(val_expression->value.linger); + live_optlen = sizeof(val_expression->value.linger); #ifdef SCTP_RTOINFO - } else if (val_expression->type == EXPR_SCTP_RTOINFO) { - live_optval = (void*) malloc(sizeof(val_expression->value.sctp_rtoinfo)); - live_optlen = sizeof(val_expression->value.sctp_rtoinfo); + } else if (val_expression->type == EXPR_SCTP_RTOINFO) { + live_optval = (void*) malloc(sizeof(val_expression->value.sctp_rtoinfo)); + live_optlen = sizeof(val_expression->value.sctp_rtoinfo); #endif #ifdef SCTP_STATUS } else if (val_expression->type == EXPR_SCTP_STATUS) { @@ -1614,27 +1614,27 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall, } if (val_expression->type == EXPR_LINGER) { - struct linger *ling = live_optval; + struct linger *ling = live_optval; if (ling->l_onoff != val_expression->value.linger.l_onoff) { asprintf(error, "Bad getsockopt Linger onoff: expected: %d actual: %u", (int)val_expression->value.linger.l_onoff, (int)ling->l_onoff); - return STATUS_ERR; + return STATUS_ERR; + } + if (ling->l_linger != val_expression->value.linger.l_linger) { + asprintf(error, "Bad getsockopt Linger Value: expected: %d actual: %d", (int)val_expression->value.linger.l_linger, (int)ling->l_linger); + return STATUS_ERR; } - if (ling->l_linger != val_expression->value.linger.l_linger) { - asprintf(error, "Bad getsockopt Linger Value: expected: %d actual: %d", (int)val_expression->value.linger.l_linger, (int)ling->l_linger); - return STATUS_ERR; - } #ifdef SCTP_RTOINFO - } else if (val_expression->type == EXPR_SCTP_RTOINFO) { + } else if (val_expression->type == EXPR_SCTP_RTOINFO) { struct sctp_rtoinfo *rtoinfo = live_optval; if (rtoinfo->srto_initial != val_expression->value.sctp_rtoinfo.srto_initial){ asprintf(error, "Bad getsockopt SCTP_RTOINFO initial: expected: %d actual: %d", (int)val_expression->value.sctp_rtoinfo.srto_initial, (int)rtoinfo->srto_initial); - return STATUS_ERR; + return STATUS_ERR; } else if (rtoinfo->srto_max != val_expression->value.sctp_rtoinfo.srto_max){ asprintf(error, "Bad getsockopt SCTP_RTOINFO SRTO_MAX: expected: %d actual: %d", (int)val_expression->value.sctp_rtoinfo.srto_max, (int)rtoinfo->srto_max); - return STATUS_ERR; + return STATUS_ERR; } else if (rtoinfo->srto_min != val_expression->value.sctp_rtoinfo.srto_min){ asprintf(error, "Bad getsockopt SCTP_RTOINFO SRTO_MIN: expected: %d actual: %d", (int)val_expression->value.sctp_rtoinfo.srto_min, (int)rtoinfo->srto_min); - return STATUS_ERR; + return STATUS_ERR; } #endif #ifdef SCTP_STATUS @@ -1643,32 +1643,32 @@ static int syscall_getsockopt(struct state *state, struct syscall_spec *syscall, struct sctp_status *expected_val = &(val_expression->value.sctp_status); if (live_val->sstat_state != expected_val->sstat_state) { asprintf(error, "Bad getsockopt SCTP_STATUS state: expected: %d actual: %d ", expected_val->sstat_state, live_val->sstat_state); - return STATUS_ERR; - } else if (live_val->sstat_rwnd != expected_val->sstat_rwnd) { + return STATUS_ERR; + } else if (live_val->sstat_rwnd != expected_val->sstat_rwnd) { asprintf(error, "Bad getsockopt SCTP_STATUS rwnd: expected: %d actual: %d ", (int) expected_val->sstat_rwnd, (int) live_val->sstat_rwnd); - return STATUS_ERR; - } else if (live_val->sstat_unackdata != expected_val->sstat_unackdata) { + return STATUS_ERR; + } else if (live_val->sstat_unackdata != expected_val->sstat_unackdata) { asprintf(error, "Bad getsockopt SCTP_STATUS unackdata: expected: %d actual: %d", (int) expected_val->sstat_unackdata, (int) live_val->sstat_unackdata); - return STATUS_ERR; - } else if (live_val->sstat_penddata != expected_val->sstat_penddata) { + return STATUS_ERR; + } else if (live_val->sstat_penddata != expected_val->sstat_penddata) { asprintf(error, "Bad getsockopt SCTP_STATUS penddata: expected: %d actual: %d", (int) expected_val->sstat_penddata, (int) live_val->sstat_penddata); - return STATUS_ERR; - } else if (live_val->sstat_instrms != expected_val->sstat_instrms) { + return STATUS_ERR; + } else if (live_val->sstat_instrms != expected_val->sstat_instrms) { asprintf(error, "Bad getsockopt SCTP_STATUS instreams: expected: %d actual: %d", (int) expected_val->sstat_instrms, (int) live_val->sstat_instrms); - return STATUS_ERR; - } else if (live_val->sstat_outstrms != expected_val->sstat_outstrms) { + return STATUS_ERR; + } else if (live_val->sstat_outstrms != expected_val->sstat_outstrms) { asprintf(error, "Bad getsockopt SCTP_STATUS outstreams: expected: %d actual: %d", (int) expected_val->sstat_outstrms, (int) live_val->sstat_outstrms); - return STATUS_ERR; + return STATUS_ERR; } else if (live_val->sstat_fragmentation_point != expected_val->sstat_fragmentation_point){ asprintf(error, "Bad getsockopt SCTP_STATUS fragmentation point: expected: %d actual: %d", (int) expected_val->sstat_fragmentation_point, (int) live_val->sstat_fragmentation_point); - return STATUS_ERR; + return STATUS_ERR; } #endif - } else { - if (*(int*)live_optval != script_optval) { + } else { + if (*(int*)live_optval != script_optval) { asprintf(error, "Bad getsockopt optval: expected: %d actual: %d", (int)script_optval, *(int*)live_optval); return STATUS_ERR; - } + } } return STATUS_OK; -- GitLab