[PATCH v2 3/6] usage.c API users: use die_message() for error() + exit 128

From

Ævar Arnfjörð Bjarmason <avarab@gmail.com>

Date

Dec 7, 2021, 18:26 UTC

Message-ID

<patch-v2-3.6-c7d67fd41fa-20211207T182419Z-avarab@gmail.com>

In-Reply-To

<cover-v2-0.6-00000000000-20211207T182419Z-avarab@gmail.com>

Continue the migration of code that printed a message and exited with
128. In this case the caller used "error()", so we'll be changing the
output from "error: " to "fatal: ". This change is intentional and
desired.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
---
 builtin/notes.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/builtin/notes.c b/builtin/notes.c
index 71c59583a17..2812d1eac40 100644
--- a/builtin/notes.c
+++ b/builtin/notes.c
@@ -201,11 +201,12 @@ static void prepare_note_data(const struct object_id *object, struct note_data *
 static void write_note_data(struct note_data *d, struct object_id *oid)
 {
 	if (write_object_file(d->buf.buf, d->buf.len, blob_type, oid)) {
-		error(_("unable to write note object"));
+		int status = die_message(_("unable to write note object"));
+
 		if (d->edit_path)
-			error(_("the note contents have been left in %s"),
-				d->edit_path);
-		exit(128);
+			die_message(_("the note contents have been left in %s"),
+				    d->edit_path);
+		exit(status);
 	}
 }
 

-- 
2.34.1.898.g5a552c2e5f0