commit 0005db920da13753451084164884a9b32ebb9f93
from: Omar Polo <op@omarpolo.com>
via: Thomas Adam <thomas@xteddy.org>
date: Mon Apr 29 12:22:32 2024 UTC

got-notify-http: consistetly use fatal instead of err

commit - 655201dd7ad04bde7edbb5968c08d62a99d5fed6
commit + 0005db920da13753451084164884a9b32ebb9f93
blob - 6f5747749d175c80bca3160cdb394aa794025a19
blob + 03cef677989c30438df23619e9eaea3e8be77f21
--- gotd/libexec/got-notify-http/got-notify-http.c
+++ gotd/libexec/got-notify-http/got-notify-http.c
@@ -91,7 +91,7 @@ dial(const char *host, const char *port)
 
 	freeaddrinfo(res0);
 	if (s == -1)
-		err(1, "%s", cause);
+		fatal("%s", cause);
 	return s;
 }
 
@@ -311,7 +311,7 @@ jsonify_commit(FILE *fp, const char *repo, char **line
 
 			author = strdup(l);
 			if (author == NULL)
-				err(1, "strdup");
+				fatal("strdup");
 
 			json_author(fp, "author", l, 1);
 
@@ -328,7 +328,7 @@ jsonify_commit(FILE *fp, const char *repo, char **line
 			}
 
 			if (author == NULL) /* impossible */
-				err(1, "from not specified");
+				fatalx("from not specified");
 			json_author(fp, "committer", author, 1);
 			free(author);
 			author = NULL;
@@ -550,9 +550,9 @@ jsonify_commit(FILE *fp, const char *repo, char **line
 		}
 	}
 	if (ferror(stdin))
-		err(1, "getline");
+		fatalx("getline");
 	if (!done)
-		errx(1, "%s: unexpected EOF", __func__);
+		fatalx("%s: unexpected EOF", __func__);
 	fputc('}', fp);
 
 	return 0;
@@ -681,9 +681,9 @@ jsonify_tag(FILE *fp, const char *repo, char **line, s
 		}
 	}
 	if (ferror(stdin))
-		err(1, "getline");
+		fatal("getline");
 	if (!done)
-		errx(1, "%s: unexpected EOF", __func__);
+		fatalx("%s: unexpected EOF", __func__);
 	fputc('}', fp);
 
 	return 0;
@@ -711,32 +711,32 @@ jsonify(FILE *fp, const char *repo)
 
 		if (strncmp(line, "Removed refs/heads/", 19) == 0) {
 			if (jsonify_branch_rm(fp, line, repo) == -1)
-				err(1, "jsonify_branch_rm");
+				fatal("jsonify_branch_rm");
 			continue;
 		}
 
 		if (strncmp(line, "commit ", 7) == 0) {
 			if (jsonify_commit(fp, repo, &line, &linesize) == -1)
-				err(1, "jsonify_commit");
+				fatal("jsonify_commit");
 			continue;
 		}
 
 		if (*line >= '0' && *line <= '9') {
 			if (jsonify_commit_short(fp, line, repo) == -1)
-				err(1, "jsonify_commit_short");
+				fatal("jsonify_commit_short");
 			continue;
 		}
 
 		if (strncmp(line, "tag ", 4) == 0) {
 			if (jsonify_tag(fp, repo, &line, &linesize) == -1)
-				err(1, "jsonify_tag");
+				fatal("jsonify_tag");
 			continue;
 		}
 
 		errx(1, "unexpected line: %s", line);
 	}
 	if (ferror(stdin))
-		err(1, "getline");
+		fatal("getline");
 	fprintf(fp, "]}");
 
 	return 0;
@@ -773,7 +773,7 @@ basic_auth(const char *username, const char *password)
 
 	r = asprintf(&str, "%s:%s", username, password);
 	if (r == -1)
-		err(1, "asprintf");
+		fatal("asprintf");
 
 	/*
 	 * Will need 4 * r/3 bytes to encode the string, plus a
@@ -785,7 +785,7 @@ basic_auth(const char *username, const char *password)
 
 	tmp = calloc(1, len);
 	if (tmp == NULL)
-		err(1, "malloc");
+		fatal("calloc");
 
 	s = str;
 	p = tmp;