From 6838239f1eddb6985d1830abc6a8297665405176 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 1 Aug 2021 17:23:48 -0700 Subject: [PATCH] backupfile: improve -fanalyzer malloc checking * lib/backup-internal.h, lib/backupfile.h: Add malloc-related attributes and include stdlib.h as needed. --- ChangeLog | 6 ++++++ lib/backup-internal.h | 4 +++- lib/backupfile.h | 9 +++++++-- 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 21fbc52e30..f63846d2b2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2021-08-01 Paul Eggert + + maint: improve -fanalyzer malloc checking + * lib/backup-internal.h, lib/backupfile.h: + Add malloc-related attributes and include stdlib.h as needed. + 2021-08-01 Jim Meyering regex: pacify GCC 11.2.1's -fanalyzer diff --git a/lib/backup-internal.h b/lib/backup-internal.h index 7016182208..863cc004e5 100644 --- a/lib/backup-internal.h +++ b/lib/backup-internal.h @@ -17,5 +17,7 @@ #include "backupfile.h" #include +#include -extern char *backupfile_internal (int, char const *, enum backup_type, bool); +extern char *backupfile_internal (int, char const *, enum backup_type, bool) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; diff --git a/lib/backupfile.h b/lib/backupfile.h index 349477064d..fc77329fe3 100644 --- a/lib/backupfile.h +++ b/lib/backupfile.h @@ -22,6 +22,8 @@ /* Get AT_FDCWD, as a convenience for users of this file. */ #include +#include + #ifdef __cplusplus extern "C" { #endif @@ -50,8 +52,11 @@ enum backup_type extern char const *simple_backup_suffix; void set_simple_backup_suffix (char const *); -char *backup_file_rename (int, char const *, enum backup_type); -char *find_backup_file_name (int, char const *, enum backup_type); +char *backup_file_rename (int, char const *, enum backup_type) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE; +char *find_backup_file_name (int, char const *, enum backup_type) + _GL_ATTRIBUTE_MALLOC _GL_ATTRIBUTE_DEALLOC_FREE + _GL_ATTRIBUTE_RETURNS_NONNULL; enum backup_type get_version (char const *context, char const *arg); enum backup_type xget_version (char const *context, char const *arg); -- 2.39.5