summaryrefslogtreecommitdiff
path: root/tempfile.c
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2017-09-05 12:14:43 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-09-06 08:19:53 (GMT)
commit9b028aa45a2016ae0dbdfeb85ad9d43f2017db0d (patch)
tree5208c5c116ffeb67bec90c1d2e00d71631152739 /tempfile.c
parentf5b4dc7668b6c8d71432af9f9ddad6f7c62d284e (diff)
downloadgit-9b028aa45a2016ae0dbdfeb85ad9d43f2017db0d.zip
git-9b028aa45a2016ae0dbdfeb85ad9d43f2017db0d.tar.gz
git-9b028aa45a2016ae0dbdfeb85ad9d43f2017db0d.tar.bz2
tempfile: replace die("BUG") with BUG()
Compared to die(), using BUG() triggers abort(). That may give us an actual coredump, which should make it easier to get a stack trace. And since the programming error for these assertions is not in the functions themselves but in their callers, such a stack trace is needed to actually find the source of the bug. In addition, abort() raises SIGABRT, which is more likely to be caught by our test suite. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'tempfile.c')
-rw-r--r--tempfile.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/tempfile.c b/tempfile.c
index 861f817..813cf6a 100644
--- a/tempfile.c
+++ b/tempfile.c
@@ -96,7 +96,7 @@ static void prepare_tempfile_object(struct tempfile *tempfile)
}
if (is_tempfile_active(tempfile))
- die("BUG: prepare_tempfile_object called for active object");
+ BUG("prepare_tempfile_object called for active object");
if (!tempfile->on_list) {
/* Initialize *tempfile and add it to tempfile_list: */
tempfile->fd = -1;
@@ -109,7 +109,7 @@ static void prepare_tempfile_object(struct tempfile *tempfile)
tempfile->on_list = 1;
} else if (tempfile->filename.len) {
/* This shouldn't happen, but better safe than sorry. */
- die("BUG: prepare_tempfile_object called for improperly-reset object");
+ BUG("prepare_tempfile_object called for improperly-reset object");
}
}
@@ -205,9 +205,9 @@ int xmks_tempfile_m(struct tempfile *tempfile, const char *template, int mode)
FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode)
{
if (!is_tempfile_active(tempfile))
- die("BUG: fdopen_tempfile() called for inactive object");
+ BUG("fdopen_tempfile() called for inactive object");
if (tempfile->fp)
- die("BUG: fdopen_tempfile() called for open object");
+ BUG("fdopen_tempfile() called for open object");
tempfile->fp = fdopen(tempfile->fd, mode);
return tempfile->fp;
@@ -216,21 +216,21 @@ FILE *fdopen_tempfile(struct tempfile *tempfile, const char *mode)
const char *get_tempfile_path(struct tempfile *tempfile)
{
if (!is_tempfile_active(tempfile))
- die("BUG: get_tempfile_path() called for inactive object");
+ BUG("get_tempfile_path() called for inactive object");
return tempfile->filename.buf;
}
int get_tempfile_fd(struct tempfile *tempfile)
{
if (!is_tempfile_active(tempfile))
- die("BUG: get_tempfile_fd() called for inactive object");
+ BUG("get_tempfile_fd() called for inactive object");
return tempfile->fd;
}
FILE *get_tempfile_fp(struct tempfile *tempfile)
{
if (!is_tempfile_active(tempfile))
- die("BUG: get_tempfile_fp() called for inactive object");
+ BUG("get_tempfile_fp() called for inactive object");
return tempfile->fp;
}
@@ -265,9 +265,9 @@ int close_tempfile_gently(struct tempfile *tempfile)
int reopen_tempfile(struct tempfile *tempfile)
{
if (!is_tempfile_active(tempfile))
- die("BUG: reopen_tempfile called for an inactive object");
+ BUG("reopen_tempfile called for an inactive object");
if (0 <= tempfile->fd)
- die("BUG: reopen_tempfile called for an open object");
+ BUG("reopen_tempfile called for an open object");
tempfile->fd = open(tempfile->filename.buf, O_WRONLY);
return tempfile->fd;
}
@@ -275,7 +275,7 @@ int reopen_tempfile(struct tempfile *tempfile)
int rename_tempfile(struct tempfile *tempfile, const char *path)
{
if (!is_tempfile_active(tempfile))
- die("BUG: rename_tempfile called for inactive object");
+ BUG("rename_tempfile called for inactive object");
if (close_tempfile_gently(tempfile)) {
delete_tempfile(tempfile);