mirror of https://github.com/davatorium/rofi.git
Cleanups
This commit is contained in:
parent
749d3e6223
commit
3188236121
|
@ -34,7 +34,8 @@
|
|||
* Sets the entry in the history, if it exists its use-count is incremented.
|
||||
*
|
||||
*/
|
||||
void history_set ( const char *filename, const char *entry );
|
||||
void history_set ( const char *filename, const char *entry )
|
||||
__attribute__((nonnull));
|
||||
|
||||
|
||||
/**
|
||||
|
@ -43,7 +44,8 @@ void history_set ( const char *filename, const char *entry );
|
|||
*
|
||||
* Removes the entry from the history.
|
||||
*/
|
||||
void history_remove ( const char *filename, const char *entry );
|
||||
void history_remove ( const char *filename, const char *entry )
|
||||
__attribute__((nonnull));
|
||||
|
||||
|
||||
/**
|
||||
|
@ -53,7 +55,8 @@ void history_remove ( const char *filename, const char *entry );
|
|||
* Gets the entries in the list (in order of usage)
|
||||
* @returns a list of entries length long. (and NULL terminated).
|
||||
*/
|
||||
char ** history_get_list ( const char *filename, unsigned int * length );
|
||||
char ** history_get_list ( const char *filename, unsigned int * length )
|
||||
__attribute__((nonnull));
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -247,12 +247,9 @@ void history_remove ( const char *filename, const char *entry )
|
|||
|
||||
// Free the list.
|
||||
for ( unsigned int iter = 0; iter < length; iter++ )
|
||||
{
|
||||
if ( list[iter] != NULL )
|
||||
{
|
||||
free ( list[iter] );
|
||||
}
|
||||
}
|
||||
if ( list != NULL )
|
||||
{
|
||||
free ( list );
|
||||
|
@ -269,6 +266,8 @@ char ** history_get_list ( const char *filename, unsigned int *length )
|
|||
FILE *fd = fopen ( filename, "r" );
|
||||
if ( fd == NULL )
|
||||
{
|
||||
// File that does not exists is not an error, so ignore it.
|
||||
// Everything else? panic.
|
||||
if ( errno != ENOENT )
|
||||
{
|
||||
fprintf ( stderr, "Failed to open file: %s\n", strerror ( errno ) );
|
||||
|
@ -279,6 +278,7 @@ char ** history_get_list ( const char *filename, unsigned int *length )
|
|||
list = __history_get_element_list ( fd, length );
|
||||
|
||||
// Copy list in right format.
|
||||
// Lists are always short, so performance should not be an issue.
|
||||
if ( ( *length ) > 0 )
|
||||
{
|
||||
retv = malloc ( ( ( *length ) + 1 ) * sizeof ( char * ) );
|
||||
|
|
Loading…
Reference in New Issue