From patchwork Sun Oct 8 11:16:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harsha Sharma X-Patchwork-Id: 822995 X-Patchwork-Delegate: pablo@netfilter.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netfilter-devel-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dUk1mxM9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3y918F2lLHz9t3t for ; Sun, 8 Oct 2017 22:18:20 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753396AbdJHLSS (ORCPT ); Sun, 8 Oct 2017 07:18:18 -0400 Received: from mail-pg0-f68.google.com ([74.125.83.68]:36044 "EHLO mail-pg0-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751556AbdJHLSQ (ORCPT ); Sun, 8 Oct 2017 07:18:16 -0400 Received: by mail-pg0-f68.google.com with SMTP id u144so5505149pgb.3 for ; Sun, 08 Oct 2017 04:18:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=lR5TeYjIMaSF2539e3dHUIrIwjgCbJNp++C/FxW3b7o=; b=dUk1mxM9Gm3ZXA2Q1zgVcMTedr54lyZSFYv7p/t5a89W56ZYQ/F4kzLV6jMxEJdKOv zLDtqzfAGhNp76gtoB6I3Q0Uq87M3pfufSL881oROWOhW29TIO6FohKDblUwPyYwqGH9 lGEsOl/qPs8gPvy5+2ZmGwqkh0JW5S1CchrrDjYWGmvvXRWH9AroTewhKdzzHaKK74fG oiWOrHJ3ErTp8eb4lno+jgNCajyOPV5WtSaUG/zb4wO2Hpho+0YDe5OdcyLluR7T8Tih ooHN9FMS3XPUKmimNLCV+SPSpqf0mhgXKY/tR3TCRB/H1qUJVV8LSiu1SgdI4LJ3+5oD uJ4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=lR5TeYjIMaSF2539e3dHUIrIwjgCbJNp++C/FxW3b7o=; b=X9GyqXvM7ST50VGMQABDxwJ92RhfWD4R3d3phpNssdECY//5tZphj5tiwvoUQFAy2z 3rGC/Jww+yEV2ih/JpV9DWA9ogpq8Kdm0VhypvG04HqPb+OSUPSztLp66HYChbhmrCrG KPNZoSK/XH7Q/Y6ewuBFWN61dR/SoOc4OqWjOqrdAjpcPQkvgRE2RJP9OCy0u3nHF20h 1FP1yxhNBuJ+/Q3jOIJ5t+ik8gzofzNA6fjCbowZn/3JF0WHDQBe8+loarBSr0OiuwfT HfLx36o5MSD9ESNvwI9un115LefbWog8vHEUt6U93nydB6sN/zP99SMs/3kuhdnpxpFe QBTQ== X-Gm-Message-State: AMCzsaWNjTQTN3xCjKmUOijv7Durnzg3JcpWVqrAeUd4Zcv+XzVq6jIh KfT8RZkk6cI9aa9CvOYOqWM= X-Google-Smtp-Source: AOwi7QAsfGlI+D4RKz9gbsnkOUOt1/kcxcrrv2ZfQr06djeU3xkoFd0ovNuWGBXlHiRZ+UuQQk21Ww== X-Received: by 10.98.34.130 with SMTP id p2mr7324610pfj.108.1507461495914; Sun, 08 Oct 2017 04:18:15 -0700 (PDT) Received: from localhost.localdomain ([103.37.201.122]) by smtp.gmail.com with ESMTPSA id 85sm2213128pfz.119.2017.10.08.04.18.13 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Oct 2017 04:18:15 -0700 (PDT) From: Harsha Sharma To: pablo@netfilter.org Cc: netfilter-devel@vger.kernel.org, outreachy-kernel@googlegroups.com, Harsha Sharma Subject: [PATCH] src: Code indent should use tabs wherever possible Date: Sun, 8 Oct 2017 16:46:04 +0530 Message-Id: <20171008111604.18781-1-harshasharmaiitr@gmail.com> X-Mailer: git-send-email 2.11.0 Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org Remove unnecessary spaces and use tabs for code indent. Signed-off-by: Harsha Sharma --- src/datatype.c | 2 +- src/evaluate.c | 10 +++++----- src/gmputil.c | 4 ++-- src/meta.c | 4 ++-- src/netlink.c | 6 +++--- src/segtree.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/datatype.c b/src/datatype.c index 94b1224..d83ecec 100644 --- a/src/datatype.c +++ b/src/datatype.c @@ -370,7 +370,7 @@ static void string_type_print(const struct expr *expr, struct output_ctx *octx) } static struct error_record *string_type_parse(const struct expr *sym, - struct expr **res) + struct expr **res) { *res = constant_expr_alloc(&sym->location, &string_type, BYTEORDER_HOST_ENDIAN, diff --git a/src/evaluate.c b/src/evaluate.c index 193ea1c..79af65c 100644 --- a/src/evaluate.c +++ b/src/evaluate.c @@ -132,7 +132,7 @@ static int byteorder_conversion(struct eval_ctx *ctx, struct expr **expr, return 0; if (expr_basetype(*expr)->type != TYPE_INTEGER) return expr_error(ctx->msgs, *expr, - "Byteorder mismatch: expected %s, got %s", + "Byteorder mismatch: expected %s, got %s", byteorder_names[byteorder], byteorder_names[(*expr)->byteorder]); @@ -1388,7 +1388,7 @@ static int expr_evaluate_hash(struct eval_ctx *ctx, struct expr **exprp) return -1; /* expr_evaluate_primary() sets the context to what to the input - * expression to be hashed. Since this input is transformed to a 4 bytes + * expression to be hashed. Since this input is transformed to a 4 bytes * integer, restore context to the datatype that results from hashing. */ __expr_set_context(&ctx->ectx, expr->dtype, expr->byteorder, expr->len, @@ -1691,7 +1691,7 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr) case EXPR_CONCAT: return expr_binary_error(ctx->msgs, left, rel, "Relational expression (%s) is undefined " - "for %s expressions", + "for %s expressions", expr_op_symbols[rel->op], left->ops->name); default: @@ -1701,7 +1701,7 @@ static int expr_evaluate_relational(struct eval_ctx *ctx, struct expr **expr) if (!expr_is_singleton(right)) return expr_binary_error(ctx->msgs, right, rel, "Relational expression (%s) is undefined " - "for %s expressions", + "for %s expressions", expr_op_symbols[rel->op], right->ops->name); @@ -1723,7 +1723,7 @@ range: case EXPR_CONCAT: return expr_binary_error(ctx->msgs, left, rel, "Relational expression (%s) is undefined" - "for %s expressions", + "for %s expressions", expr_op_symbols[rel->op], left->ops->name); default: diff --git a/src/gmputil.c b/src/gmputil.c index 3cc4e61..a817bb8 100644 --- a/src/gmputil.c +++ b/src/gmputil.c @@ -50,11 +50,11 @@ void mpz_rshift_ui(mpz_t rop, unsigned int n) #define mpz_get_type(type, endian, op) \ ({ \ - type ret = 0; \ + type ret = 0; \ size_t cnt; \ mpz_export(&ret, &cnt, MPZ_LSWF, sizeof(ret), endian, 0, op); \ assert(cnt <= 1); \ - ret; \ + ret; \ }) uint64_t mpz_get_uint64(const mpz_t op) diff --git a/src/meta.c b/src/meta.c index 56b9e29..e387028 100644 --- a/src/meta.c +++ b/src/meta.c @@ -625,8 +625,8 @@ struct stmt *meta_stmt_meta_iiftype(const struct location *loc, uint16_t type) } struct error_record *meta_key_parse(const struct location *loc, - const char *str, - unsigned int *value) + const char *str, + unsigned int *value) { int ret, len, offset = 0; const char *sep = ""; diff --git a/src/netlink.c b/src/netlink.c index d5d410a..c1d0d56 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -445,7 +445,7 @@ struct expr *netlink_alloc_data(const struct location *loc, int netlink_add_rule_batch(struct netlink_ctx *ctx, const struct handle *h, - const struct rule *rule, uint32_t flags) + const struct rule *rule, uint32_t flags) { struct nftnl_rule *nlr; int err; @@ -2117,7 +2117,7 @@ out: /* returns true if the event should be ignored (i.e. null element) */ static bool netlink_event_ignore_range_event(struct nftnl_set_elem *nlse) { - uint32_t flags = 0; + uint32_t flags = 0; if (nftnl_set_elem_is_set(nlse, NFTNL_SET_ELEM_FLAGS)) flags = nftnl_set_elem_get_u32(nlse, NFTNL_SET_ELEM_FLAGS); @@ -2765,7 +2765,7 @@ next: } static void trace_print_packet(const struct nftnl_trace *nlt, - struct output_ctx *octx) + struct output_ctx *octx) { struct list_head stmts = LIST_HEAD_INIT(stmts); const struct proto_desc *ll_desc; diff --git a/src/segtree.c b/src/segtree.c index f0efd15..1dd8039 100644 --- a/src/segtree.c +++ b/src/segtree.c @@ -346,9 +346,9 @@ static bool interval_overlap(const struct elementary_interval *e1, return false; return (mpz_cmp(e1->left, e2->left) >= 0 && - mpz_cmp(e1->left, e2->right) <= 0) || + mpz_cmp(e1->left, e2->right) <= 0) || (mpz_cmp(e1->right, e2->left) >= 0 && - mpz_cmp(e1->right, e2->right) <= 0) || + mpz_cmp(e1->right, e2->right) <= 0) || (mpz_cmp(e1->left, e2->left) <= 0 && mpz_cmp(e1->right, e2->right) >= 0); }