libburnia
/
libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Moved some functions from util.c to hfsplus.c

This commit is contained in:
Thomas Schmitt 2012-07-03 18:56:26 +02:00
parent e8f6f924bd
commit b07d60bbfc
2 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libisofs/hfsplus.c
View File

@ -1988,3 +1988,43 @@ int hfsplus_tail_writer_create(Ecma119Image *target)
return ISO_SUCCESS;
}
/* API */
int iso_hfsplus_xinfo_func(void *data, int flag)
{
if (flag == 1 && data != NULL)
free(data);
return 1;
}
/* API */
struct iso_hfsplus_xinfo_data *iso_hfsplus_xinfo_new(int flag)
{
struct iso_hfsplus_xinfo_data *o;
o = calloc(1, sizeof(struct iso_hfsplus_xinfo_data));
if (o == NULL)
return NULL;
o->version = 0;
return o;
}
/* The iso_node_xinfo_cloner function which gets associated to
* iso_hfsplus_xinfo_func by iso_init() resp. iso_init_with_flag() via
* iso_node_xinfo_make_clonable()
*/
int iso_hfsplus_xinfo_cloner(void *old_data, void **new_data, int flag)
{
*new_data = NULL;
if (flag)
return ISO_XINFO_NO_CLONE;
if (old_data == NULL)
return 0;
*new_data = iso_hfsplus_xinfo_new(0);
if(*new_data == NULL)
return ISO_OUT_OF_MEM;
memcpy(*new_data, old_data, sizeof(struct iso_hfsplus_xinfo_data));
return ISO_SUCCESS;
}

39
libisofs/util.c
View File

@ -2078,42 +2078,3 @@ void *iso_alloc_mem(size_t size, size_t count, int flag)
}
/* API, >>> ts B20525 : should finally go to hfplus.c */
int iso_hfsplus_xinfo_func(void *data, int flag)
{
if (flag == 1 && data != NULL)
free(data);
return 1;
}
/* API, >>> ts B20525 : should finally go to hfplus.c */
struct iso_hfsplus_xinfo_data *iso_hfsplus_xinfo_new(int flag)
{
struct iso_hfsplus_xinfo_data *o;
o = calloc(1, sizeof(struct iso_hfsplus_xinfo_data));
if (o == NULL)
return NULL;
o->version = 0;
return o;
}
/* The iso_node_xinfo_cloner function which gets associated to
* iso_hfsplus_xinfo_func by iso_init() resp. iso_init_with_flag() via
* iso_node_xinfo_make_clonable()
*/
int iso_hfsplus_xinfo_cloner(void *old_data, void **new_data, int flag)
{
*new_data = NULL;
if (flag)
return ISO_XINFO_NO_CLONE;
if (old_data == NULL)
return 0;
*new_data = iso_hfsplus_xinfo_new(0);
if(*new_data == NULL)
return ISO_OUT_OF_MEM;
memcpy(*new_data, old_data, sizeof(struct iso_hfsplus_xinfo_data));
return ISO_SUCCESS;
}