Tarantool development patches archive
 help / color / mirror / Atom feed
From: Nikita Pettik <korablev@tarantool.org>
To: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH] json: fix assert typo in json_path_cmp()
Date: Mon, 11 Nov 2019 18:06:32 +0300	[thread overview]
Message-ID: <20191111150632.95154-1-korablev@tarantool.org> (raw)

   284  int
   285  json_path_cmp(const char *a, int a_len, const char *b, int b_len,
   286                int index_base)
   287  {

  ...

   304          /* Paths a and b must be valid. */
   305          assert(rc_b == 0 && rc_b == 0);

Obviously (according to the comment) author implied that both rc_a == 0
and rc_b == 0. Let's fix this small typo.
---
Branch: https://github.com/tarantool/tarantool/tree/np/json-assert-typo

 src/lib/json/json.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/json/json.c b/src/lib/json/json.c
index 1bfef172a..ffac2c2b5 100644
--- a/src/lib/json/json.c
+++ b/src/lib/json/json.c
@@ -302,7 +302,7 @@ json_path_cmp(const char *a, int a_len, const char *b, int b_len,
 			return rc;
 	}
 	/* Paths a and b must be valid. */
-	assert(rc_b == 0 && rc_b == 0);
+	assert(rc_a == 0 && rc_b == 0);
 	/*
 	 * The parser stopped because the end of one of the paths
 	 * was reached. As JSON_TOKEN_END > JSON_TOKEN_{NUM, STR},
-- 
2.15.1

             reply	other threads:[~2019-11-11 15:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-11-11 15:06 Nikita Pettik [this message]
2019-11-12 10:05 ` Kirill Yukhin
2019-11-12 12:43   ` Nikita Pettik

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191111150632.95154-1-korablev@tarantool.org \
    --to=korablev@tarantool.org \
    --cc=tarantool-patches@dev.tarantool.org \
    --subject='Re: [Tarantool-patches] [PATCH] json: fix assert typo in json_path_cmp()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox