TapTap/FastSync
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

fix: resolve cppcheck shadow/always-true findings

Browse Source
This commit is contained in:
TapTap
2026-09-21 21:28:36 +02:00
parent 8d46a26c04
commit 338c27db73
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/shared/credentials.c
+3 -3
View File
@@ -141,9 +141,9 @@ static FILE* secret_file_open(const char* path, char* err, size_t err_size) {
* most systems, but explicit. Failures here are ignored: O_NONBLOCK on a * most systems, but explicit. Failures here are ignored: O_NONBLOCK on a
* regular file does not affect reads either way. */ * regular file does not affect reads either way. */
if (S_ISREG(st.st_mode)) { if (S_ISREG(st.st_mode)) {
int flags = fcntl(fd, F_GETFL); int status_flags = fcntl(fd, F_GETFL);
if (flags >= 0) if (status_flags >= 0)
(void)fcntl(fd, F_SETFL, flags & ~O_NONBLOCK); (void)fcntl(fd, F_SETFL, status_flags & ~O_NONBLOCK);
} }
FILE* fp = fdopen(fd, "r"); FILE* fp = fdopen(fd, "r");
if (!fp) { if (!fp) {
tests/test_file.c
-2
View File
@@ -411,7 +411,6 @@ static void test_file_open_temp_dir_symlink_confinement() {
EXPECT_EQ_INT(mkdir(scratch, 0755), 0); EXPECT_EQ_INT(mkdir(scratch, 0755), 0);
int scratch_fd = file_open_temp_dir(scratch); int scratch_fd = file_open_temp_dir(scratch);
EXPECT_TRUE(scratch_fd >= 0); EXPECT_TRUE(scratch_fd >= 0);
if (scratch_fd >= 0)
close(scratch_fd); close(scratch_fd);
/* A symlink whose target is outside the root is refused. */ /* A symlink whose target is outside the root is refused. */
@@ -426,7 +425,6 @@ static void test_file_open_temp_dir_symlink_confinement() {
EXPECT_EQ_INT(symlink(scratch, inside_link), 0); EXPECT_EQ_INT(symlink(scratch, inside_link), 0);
int link_fd = file_open_temp_dir(inside_link); int link_fd = file_open_temp_dir(inside_link);
EXPECT_TRUE(link_fd >= 0); EXPECT_TRUE(link_fd >= 0);
if (link_fd >= 0)
close(link_fd); close(link_fd);
free(inside_link); free(inside_link);