Deduplicate calls similar to errExit

Use errExit in every place that uses __FILE__ and __LINE__ manually.

Note: This currently only happens in the duplicated `is_dir` function.

3 files changed, 4 insertions, 10 deletions

diff --git a/src/fbuilder/utils.c b/src/fbuilder/utils.c
index fa432d003..91c5a1a5e 100644
--- a/src/fbuilder/utils.c
+++ b/src/fbuilder/utils.c
@@ -34,10 +34,8 @@ int is_dir(const char *fname) {
                 rv = stat(fname, &s);
         else {
                 char *tmp;
-                if (asprintf(&tmp, "%s/", fname) == -1) {
-                        fprintf(stderr, "Error: cannot allocate memory, %s:%d\n", __FILE__, __LINE__);
+                if (asprintf(&tmp, "%s/", fname) == -1)
                         errExit("asprintf");
-                }
                 rv = stat(tmp, &s);
                 free(tmp);
         }
diff --git a/src/firejail/util.c b/src/firejail/util.c
index 555486916..87b771867 100644
--- a/src/firejail/util.c
+++ b/src/firejail/util.c
@@ -559,10 +559,8 @@ int is_dir(const char *fname) {
                 rv = stat_as_user(fname, &s);
         else {
                 char *tmp;
-                if (asprintf(&tmp, "%s/", fname) == -1) {
-                        fprintf(stderr, "Error: cannot allocate memory, %s:%d\n", __FILE__, __LINE__);
+                if (asprintf(&tmp, "%s/", fname) == -1)
                         errExit("asprintf");
-                }
                 rv = stat_as_user(tmp, &s);
                 free(tmp);
         }
diff --git a/src/ftee/main.c b/src/ftee/main.c
index a34a76b26..20e25c202 100644
--- a/src/ftee/main.c
+++ b/src/ftee/main.c
@@ -148,10 +148,8 @@ static int is_dir(const char *fname) {
                 rv = stat(fname, &s);
         else {
                 char *tmp;
-                if (asprintf(&tmp, "%s/", fname) == -1) {
-                        fprintf(stderr, "Error: cannot allocate memory, %s:%d\n", __FILE__, __LINE__);
-                        exit(1);
-                }
+                if (asprintf(&tmp, "%s/", fname) == -1)
+                        errExit("asprintf");
                 rv = stat(tmp, &s);
                 free(tmp);
         }