emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

librc: mark rc_deptree_* functions as mallocs

Browse Source 
(This is analogous to the rc_stringlist change.)

This gives a hint to the compiler that allocations (return values)
from this function should be paired with a corresponding dealloc/free
function.

Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James 2022-03-31 08:27:42 +01:00 committed by William Hubbs
parent 000a2c19b4
commit 7b2e8f9efd
2 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librc/librc-depend.c
View File

@ -76,6 +76,8 @@ rc_deptree_free(RC_DEPTREE *deptree)
free(di); free(di);
di = di2; di = di2;
} }
/* Use free() here since rc_deptree_free should not call itself */
free(deptree); free(deptree);
} }

14
src/librc/rc.h.in
View File

@ -407,6 +407,10 @@ bool rc_older_than(const char *, const char *, time_t *, char *);
* @return pointer to the value, otherwise NULL */ * @return pointer to the value, otherwise NULL */
char *rc_proc_getent(const char *); char *rc_proc_getent(const char *);
/*! Free a deptree and its information
* @param deptree to free */
void rc_deptree_free(RC_DEPTREE *);
/*! Update the cached dependency tree if it's older than any init script, /*! Update the cached dependency tree if it's older than any init script,
* its configuration file or an external configuration file the init script * its configuration file or an external configuration file the init script
* has specified. * has specified.
@ -426,11 +430,17 @@ bool rc_deptree_update_needed(time_t *, char *);
/*! Load the cached dependency tree and return a pointer to it. /*! Load the cached dependency tree and return a pointer to it.
* This pointer should be freed with rc_deptree_free when done. * This pointer should be freed with rc_deptree_free when done.
* @return pointer to the dependency tree */ * @return pointer to the dependency tree */
#ifdef HAVE_MALLOC_EXTENDED_ATTRIBUTE
__attribute__ ((malloc (rc_deptree_free, 1)))
#endif
RC_DEPTREE *rc_deptree_load(void); RC_DEPTREE *rc_deptree_load(void);
/*! Load a cached dependency tree from the specified file and return a pointer /*! Load a cached dependency tree from the specified file and return a pointer
* to it. This pointer should be freed with rc_deptree_free when done. * to it. This pointer should be freed with rc_deptree_free when done.
* @return pointer to the dependency tree */ * @return pointer to the dependency tree */
#ifdef HAVE_MALLOC_EXTENDED_ATTRIBUTE
__attribute__ ((malloc (rc_deptree_free, 1)))
#endif
RC_DEPTREE *rc_deptree_load_file(const char *); RC_DEPTREE *rc_deptree_load_file(const char *);
/*! List the depend for the type of service /*! List the depend for the type of service
@ -459,10 +469,6 @@ RC_STRINGLIST *rc_deptree_depends(const RC_DEPTREE *, const RC_STRINGLIST *,
* @return NULL terminated list of services in order */ * @return NULL terminated list of services in order */
RC_STRINGLIST *rc_deptree_order(const RC_DEPTREE *, const char *, int); RC_STRINGLIST *rc_deptree_order(const RC_DEPTREE *, const char *, int);
/*! Free a deptree and its information
* @param deptree to free */
void rc_deptree_free(RC_DEPTREE *);
/*! @name Plugins /*! @name Plugins
* For each plugin loaded we will call rc_plugin_hook with the below * For each plugin loaded we will call rc_plugin_hook with the below
* enum and either the runlevel name or service name. * enum and either the runlevel name or service name.