From: "Derrick Stolee via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: peff@peff.net, brad@brad-smith.co.uk, sunshine@sunshineco.com,
Derrick Stolee <dstolee@microsoft.com>,
Junio C Hamano <gitster@pobox.com>,
Derrick Stolee <dstolee@microsoft.com>
Subject: [PATCH 2/3] graph: replace assert() with graph_assert() macro
Date: Tue, 07 Jan 2020 14:55:46 +0000 [thread overview]
Message-ID: <5dd305d2f0de43a70b46336c8f1a62437e0511e1.1578408947.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.517.git.1578408947.gitgitgadget@gmail.com>
From: Derrick Stolee <dstolee@microsoft.com>
The assert() macro is sometimes compiled out. Instead, switch these into
BUG() statements using our own custom macro.
Reported-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
---
graph.c | 22 ++++++++++++----------
1 file changed, 12 insertions(+), 10 deletions(-)
diff --git a/graph.c b/graph.c
index aaf97069bd..ac78bdf96c 100644
--- a/graph.c
+++ b/graph.c
@@ -6,6 +6,8 @@
#include "revision.h"
#include "argv-array.h"
+#define graph_assert(exp) if (!(exp)) { BUG("assert failed: "#exp""); }
+
/* Internal API */
/*
@@ -316,7 +318,7 @@ static struct strbuf *diff_output_prefix_callback(struct diff_options *opt, void
struct git_graph *graph = data;
static struct strbuf msgbuf = STRBUF_INIT;
- assert(opt);
+ graph_assert(opt);
strbuf_reset(&msgbuf);
if (opt->line_prefix)
@@ -865,13 +867,13 @@ static void graph_output_pre_commit_line(struct git_graph *graph,
*
* We need 2 extra rows for every parent over 2.
*/
- assert(graph->num_parents >= 3);
+ graph_assert(graph->num_parents >= 3);
/*
* graph->expansion_row tracks the current expansion row we are on.
* It should be in the range [0, num_expansion_rows - 1]
*/
- assert(0 <= graph->expansion_row &&
+ graph_assert(0 <= graph->expansion_row &&
graph->expansion_row < graph_num_expansion_rows(graph));
/*
@@ -923,13 +925,13 @@ static void graph_output_commit_char(struct git_graph *graph, struct graph_line
* (We should only see boundary commits when revs->boundary is set.)
*/
if (graph->commit->object.flags & BOUNDARY) {
- assert(graph->revs->boundary);
+ graph_assert(graph->revs->boundary);
graph_line_addch(line, 'o');
return;
}
/*
- * get_revision_mark() handles all other cases without assert()
+ * get_revision_mark() handles all other cases without graph_assert()
*/
graph_line_addstr(line, get_revision_mark(graph->revs, graph->commit));
}
@@ -1094,7 +1096,7 @@ static void graph_output_post_merge_line(struct git_graph *graph, struct graph_l
for (j = 0; j < graph->num_parents; j++) {
par_column = graph_find_new_column_by_commit(graph, parents->item);
- assert(par_column >= 0);
+ graph_assert(par_column >= 0);
c = merge_chars[idx];
graph_line_write_column(line, &graph->new_columns[par_column], c);
@@ -1172,14 +1174,14 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct graph_l
* the graph much more legible, since whenever branches
* cross, only one is moving directions.
*/
- assert(target * 2 <= i);
+ graph_assert(target * 2 <= i);
if (target * 2 == i) {
/*
* This column is already in the
* correct place
*/
- assert(graph->mapping[i] == -1);
+ graph_assert(graph->mapping[i] == -1);
graph->mapping[i] = target;
} else if (graph->mapping[i - 1] < 0) {
/*
@@ -1225,8 +1227,8 @@ static void graph_output_collapsing_line(struct git_graph *graph, struct graph_l
* The space just to the left of this
* branch should always be empty.
*/
- assert(graph->mapping[i - 1] > target);
- assert(graph->mapping[i - 2] < 0);
+ graph_assert(graph->mapping[i - 1] > target);
+ graph_assert(graph->mapping[i - 2] < 0);
graph->mapping[i - 2] = target;
/*
* Mark this branch as the horizontal edge to
--
gitgitgadget
next prev parent reply other threads:[~2020-01-07 14:55 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-07 14:55 [PATCH 0/3] Fix two bugs in graph.c Derrick Stolee via GitGitGadget
2020-01-07 14:55 ` [PATCH 1/3] graph: fix case that hit assert() Derrick Stolee via GitGitGadget
2020-01-07 15:30 ` Jeff King
2020-01-07 18:47 ` Derrick Stolee
2020-01-07 19:21 ` Junio C Hamano
2020-01-07 19:31 ` Jeff King
2020-01-07 20:21 ` Junio C Hamano
2020-01-07 14:55 ` Derrick Stolee via GitGitGadget [this message]
2020-01-07 15:36 ` [PATCH 2/3] graph: replace assert() with graph_assert() macro Jeff King
2020-01-07 15:51 ` Eric Sunshine
2020-01-07 18:45 ` Derrick Stolee
2020-01-07 14:55 ` [PATCH 3/3] t4215: add bigger graph collapse test Derrick Stolee via GitGitGadget
2020-01-07 15:39 ` Jeff King
2020-01-07 18:02 ` Junio C Hamano
2020-01-07 18:04 ` Jeff King
2020-01-07 18:44 ` Derrick Stolee
2020-01-07 17:13 ` [PATCH 0/3] Fix two bugs in graph.c Junio C Hamano
2020-01-07 21:27 ` [PATCH v2 0/2] " Derrick Stolee via GitGitGadget
2020-01-07 21:27 ` [PATCH v2 1/2] graph: fix case that hit assert() Derrick Stolee via GitGitGadget
2020-01-07 21:50 ` Junio C Hamano
2020-01-08 17:34 ` Junio C Hamano
2020-01-08 19:14 ` Derrick Stolee
2020-01-07 21:27 ` [PATCH v2 2/2] graph: fix lack of color in horizontal lines Derrick Stolee via GitGitGadget
2020-01-07 21:51 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=5dd305d2f0de43a70b46336c8f1a62437e0511e1.1578408947.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=brad@brad-smith.co.uk \
--cc=dstolee@microsoft.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).