ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libsmartcols: always deallocate in scols_reset_cell() 

Signed-off-by: Karel Zak <kzak@redhat.com>
This commit is contained in:
Karel Zak 2014-03-28 12:25:58 +01:00
parent 10a628c8b3
commit 92e0d69c73
2 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
libsmartcols/src/cell.c
View File

@ -44,8 +44,7 @@ int scols_reset_cell(struct libscols_cell *ce)
if (!ce)
return -EINVAL;
if (!ce->is_ref)
free(ce->data);
free(ce->data);
free(ce->color);
memset(ce, 0, sizeof(*ce));
return 0;
@ -73,10 +72,8 @@ int scols_cell_set_data(struct libscols_cell *ce, const char *str)
if (!p)
return -ENOMEM;
}
if (!ce->is_ref)
free(ce->data);
free(ce->data);
ce->data = p;
ce->is_ref = 0;
return 0;
}
@ -85,22 +82,21 @@ int scols_cell_set_data(struct libscols_cell *ce, const char *str)
* @ce: a pointer to a struct libscols_cell instance
* @str: user data
*
* Adds a reference to @str to @ce.
* Adds a reference to @str to @ce. The pointer is deallocated by
* scols_reset_cell() or scols_unref_line(). This function is mostly designed
* for situations when the data for the cell are already composed in allocated
* memory (e.g. asprintf()) to avoid extra unnecessary strdup().
*
* Returns: 0, a negative value in case of an error.
*/
int scols_cell_refer_data(struct libscols_cell *ce, char *str)
{
char *p = NULL;
assert(ce);
if (!ce)
return -EINVAL;
if (!ce->is_ref)
free(ce->data);
ce->data = p;
ce->is_ref = 1;
free(ce->data);
ce->data = str;
return 0;
}

2
libsmartcols/src/smartcolsP.h
View File

@ -49,8 +49,6 @@ struct libscols_symbols {
struct libscols_cell {
char *data;
char *color;
unsigned int is_ref; /* data is reference to foreign pointer */
};