Skip to content

Commit ee8462c

Browse files
committed
Fix warnings
notify_test always compiled the FAN_FS_ERROR report helper and counter even when configure disabled FAN_FS_ERROR support. In that configuration the test body using them is omitted, leaving the helper and variable unused. The FAN_FS_ERROR-only helper and counter are now guarded by TEST_HAVE_FAN_FS_ERROR, matching the guarded assertions that use them. free_language_mimes now consumes the avl_remove return value and frees the removed node, satisfying the warn_unused_result contract without changing ownership.
1 parent e65bbdb commit ee8462c

2 files changed

Lines changed: 10 additions & 3 deletions

File tree

src/cli/ignore-mounts.c

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,10 +266,13 @@ static int insert_language_mime(avl_tree_t *languages, const char *mime)
266266
static void free_language_mimes(avl_tree_t *languages)
267267
{
268268
while (languages->root) {
269-
struct language_entry *entry =
270-
(struct language_entry *)languages->root;
269+
struct language_entry *entry;
270+
271+
entry = (struct language_entry *)
272+
avl_remove(languages, languages->root);
273+
if (entry == NULL)
274+
break;
271275

272-
avl_remove(languages, &entry->avl);
273276
free(entry->mime);
274277
free(entry);
275278
}

src/tests/notify_test.c

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -163,6 +163,7 @@ static void read_operating_mode_report(char *buf, size_t size)
163163
fclose(f);
164164
}
165165

166+
#if TEST_HAVE_FAN_FS_ERROR
166167
/*
167168
* read_fs_error_report - capture recent FAN_FS_ERROR detail output.
168169
* @buf: destination buffer.
@@ -184,6 +185,7 @@ static void read_fs_error_report(char *buf, size_t size)
184185
buf[used] = 0;
185186
fclose(f);
186187
}
188+
#endif
187189

188190
/*
189191
* test_operating_mode_report_order - verify state field order.
@@ -346,7 +348,9 @@ int main(void)
346348
};
347349
unsigned long before, after;
348350
unsigned long overflow_after, reply_after;
351+
#if TEST_HAVE_FAN_FS_ERROR
349352
unsigned long fs_error_after = 0;
353+
#endif
350354
char report[4096], expected[128];
351355
int event_pipe[2];
352356

0 commit comments

Comments
 (0)