lbutils: simplify getprogname usage

the functions no longer return errors, so i don't
need to handle them.

furthermore, the handling in state.c is redundant,
so i've removed that too.

Signed-off-by: Leah Rowe <leah@libreboot.org>

2 files changed, 2 insertions, 10 deletions

diff --git a/util/libreboot-utils/lib/state.c b/util/libreboot-utils/lib/state.c
index a3cd5b1f..bcf2ccbc 100644
--- a/util/libreboot-utils/lib/state.c
+++ b/util/libreboot-utils/lib/state.c
@@ -77,9 +77,6 @@ xstart(int argc, char *argv[])
 	/* .f */
 	{0},
 
-	/* .argv0 (for our getprogname implementation) */
-	NULL,
-
 	/* ->i   (index to cmd[]) */
 	0,
 
@@ -103,7 +100,6 @@ xstart(int argc, char *argv[])
 
 	us.f.buf = us.f.real_buf;
 
-	us.argv0 = argv[0];
 	us.f.fname = argv[1];
 
 	us.f.tmp_fd = -1;
diff --git a/util/libreboot-utils/lib/string.c b/util/libreboot-utils/lib/string.c
index c3cf4519..c7f90f5d 100644
--- a/util/libreboot-utils/lib/string.c
+++ b/util/libreboot-utils/lib/string.c
@@ -324,17 +324,13 @@ err_exit(int nvm_errval, const char *msg, ...)
 	if (!errno)
 		saved_errno = errno = ECANCELED;
 
-	if ((p = lbgetprogname()) != NULL)
-		fprintf(stderr, "%s: ", p);
+	fprintf(stderr, "%s: ", lbgetprogname());
 
 	va_start(args, msg);
 	vfprintf(stderr, msg, args);
 	va_end(args);
 
-	if (p != NULL)
-		fprintf(stderr, ": %s\n", strerror(errno));
-	else
-		fprintf(stderr, "%s\n", strerror(errno));
+	fprintf(stderr, ": %s\n", strerror(errno));
 
 	exit(EXIT_FAILURE);
 }