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

Attributed HFS+ blessings to IsoImage rather than IsoWriteOpts.

Browse Source
This commit is contained in:
Thomas Schmitt
2012-05-25 19:34:09 +02:00
parent 1842921b2c
commit 82f39020cf
6 changed files with 78 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
libisofs/ecma119.c
View File

@ -1872,7 +1872,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
}
strcpy(target->ascii_disc_label, opts->ascii_disc_label);
for (i = 0; i < ISO_HFSPLUS_BLESS_MAX; i++) {
target->hfsplus_blessed[i] = opts->hfsplus_blessed[i];
target->hfsplus_blessed[i] = src->hfsplus_blessed[i];
if (target->hfsplus_blessed[i] != NULL)
iso_node_ref(target->hfsplus_blessed[i]);
}
@ -2607,8 +2607,6 @@ int iso_write_opts_new(IsoWriteOpts **opts, int profile)
wopts->allow_dir_id_ext = 0;
wopts->old_empty = 0;
wopts->untranslated_name_len = 0;
for (i = 0; i < ISO_HFSPLUS_BLESS_MAX; i++)
wopts->hfsplus_blessed[i] = NULL;
*opts = wopts;
return ISO_SUCCESS;
@ -2635,9 +2633,6 @@ void iso_write_opts_free(IsoWriteOpts *opts)
for (i = 0; i < ISO_MAX_PARTITIONS; i++)
if (opts->appended_partitions[i] != NULL)
free(opts->appended_partitions[i]);
for (i = 0; i < ISO_HFSPLUS_BLESS_MAX; i++)
if (opts->hfsplus_blessed[i] != NULL)
iso_node_unref(opts->hfsplus_blessed[i]);
free(opts);
}
@ -3231,12 +3226,3 @@ int iso_write_opts_set_disc_label(IsoWriteOpts *opts, char *label)
return ISO_SUCCESS;
}
/* API */
int iso_write_opts_bless(IsoWriteOpts *opts, enum IsoHfsplusBlessings blessing,
IsoNode *node, int flag)
{
/* >>> */;
return 0;
}