diff options
author | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-16 16:02:43 -0300 |
---|---|---|
committer | Kelvin M. Klann <kmk3.code@protonmail.com> | 2023-06-28 03:43:51 -0300 |
commit | 33fb2bed58e9f4dfadd2f69f90e474fd46099419 (patch) | |
tree | 5468ece6e39ed9a8f7be91834a45a106d6357a74 /src | |
parent | RELNOTES: add build items (diff) | |
download | firejail-33fb2bed58e9f4dfadd2f69f90e474fd46099419.tar.gz firejail-33fb2bed58e9f4dfadd2f69f90e474fd46099419.tar.zst firejail-33fb2bed58e9f4dfadd2f69f90e474fd46099419.zip |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/fbuilder/utils.c | 4 | ||||
-rw-r--r-- | src/firejail/util.c | 4 | ||||
-rw-r--r-- | src/ftee/main.c | 6 |
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) { | |||
34 | rv = stat(fname, &s); | 34 | rv = stat(fname, &s); |
35 | else { | 35 | else { |
36 | char *tmp; | 36 | char *tmp; |
37 | if (asprintf(&tmp, "%s/", fname) == -1) { | 37 | if (asprintf(&tmp, "%s/", fname) == -1) |
38 | fprintf(stderr, "Error: cannot allocate memory, %s:%d\n", __FILE__, __LINE__); | ||
39 | errExit("asprintf"); | 38 | errExit("asprintf"); |
40 | } | ||
41 | rv = stat(tmp, &s); | 39 | rv = stat(tmp, &s); |
42 | free(tmp); | 40 | free(tmp); |
43 | } | 41 | } |
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) { | |||
559 | rv = stat_as_user(fname, &s); | 559 | rv = stat_as_user(fname, &s); |
560 | else { | 560 | else { |
561 | char *tmp; | 561 | char *tmp; |
562 | if (asprintf(&tmp, "%s/", fname) == -1) { | 562 | if (asprintf(&tmp, "%s/", fname) == -1) |
563 | fprintf(stderr, "Error: cannot allocate memory, %s:%d\n", __FILE__, __LINE__); | ||
564 | errExit("asprintf"); | 563 | errExit("asprintf"); |
565 | } | ||
566 | rv = stat_as_user(tmp, &s); | 564 | rv = stat_as_user(tmp, &s); |
567 | free(tmp); | 565 | free(tmp); |
568 | } | 566 | } |
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) { | |||
148 | rv = stat(fname, &s); | 148 | rv = stat(fname, &s); |
149 | else { | 149 | else { |
150 | char *tmp; | 150 | char *tmp; |
151 | if (asprintf(&tmp, "%s/", fname) == -1) { | 151 | if (asprintf(&tmp, "%s/", fname) == -1) |
152 | fprintf(stderr, "Error: cannot allocate memory, %s:%d\n", __FILE__, __LINE__); | 152 | errExit("asprintf"); |
153 | exit(1); | ||
154 | } | ||
155 | rv = stat(tmp, &s); | 153 | rv = stat(tmp, &s); |
156 | free(tmp); | 154 | free(tmp); |
157 | } | 155 | } |