diff options
| author | Eric Biggers <ebiggers@google.com> | 2023-01-21 12:32:06 -0800 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2023-01-27 12:33:59 -0500 |
| commit | 6a5d03d4a5cd1fae84c94c797f28e86fae831865 (patch) | |
| tree | a04081f5eea4334dd41942cbf56d8e4f4d225363 | |
| parent | dd54f64593b0a44e745af9934506cf0791d16ef3 (diff) | |
| download | e2fsprogs-6a5d03d4a5cd1fae84c94c797f28e86fae831865.tar.gz | |
lib/et: fix "unused variable" warnings when !HAVE_FCNTL
In init_debug(), avoid -Wunused-variable and -Wunused-but-set-variable
warnings when HAVE_FCNTL is not defined by only declaring 'fd' and
'flags' when HAVE_FCNTL is defined. This affected Windows builds.
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
| -rw-r--r-- | lib/et/Android.bp | 3 | ||||
| -rw-r--r-- | lib/et/error_message.c | 10 |
2 files changed, 5 insertions, 8 deletions
diff --git a/lib/et/Android.bp b/lib/et/Android.bp index 07f3c277e..565feb594 100644 --- a/lib/et/Android.bp +++ b/lib/et/Android.bp @@ -31,9 +31,6 @@ cc_library { target: { windows: { enabled: true, - cflags: [ - "-Wno-unused-variable", - ], }, }, diff --git a/lib/et/error_message.c b/lib/et/error_message.c index cd9f57f56..8b9474ffa 100644 --- a/lib/et/error_message.c +++ b/lib/et/error_message.c @@ -235,7 +235,6 @@ static FILE *debug_f = 0; static void init_debug(void) { char *dstr, *fn, *tmp; - int fd, flags; if (debug_mask & DEBUG_INIT) return; @@ -257,10 +256,12 @@ static void init_debug(void) if (!debug_f) debug_f = fopen("/dev/tty", "a"); if (debug_f) { - fd = fileno(debug_f); -#if defined(HAVE_FCNTL) +#ifdef HAVE_FCNTL + int fd = fileno(debug_f); + if (fd >= 0) { - flags = fcntl(fd, F_GETFD); + int flags = fcntl(fd, F_GETFD); + if (flags >= 0) flags = fcntl(fd, F_SETFD, flags | FD_CLOEXEC); if (flags < 0) { @@ -274,7 +275,6 @@ static void init_debug(void) #endif } else debug_mask = DEBUG_INIT; - } /* |