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

Changed interface of helper function iso_tell_max_part_range()

Browse Source
This commit is contained in:
Thomas Schmitt 2019-01-15 19:07:01 +01:00
parent a1e75003b5
commit e1097dbb5d
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libisofs/ecma119.c
View File

@ -4604,12 +4604,13 @@ ex: /* LIBISO_ALLOC_MEM failed */
/* Determines the range of valid partition numbers depending on partition /* Determines the range of valid partition numbers depending on partition
table type. table type.
*/ */
void iso_tell_max_part_range(Ecma119Image *target, void iso_tell_max_part_range(IsoWriteOpts *opts,
int *first_partition, int *last_partition) int *first_partition, int *last_partition,
int flag)
{ {
int sa_type; int sa_type;
sa_type = (target->system_area_options >> 2) & 0x3f; sa_type = (opts->system_area_options >> 2) & 0x3f;
if (sa_type == 3) { /* SUN Disk Label */ if (sa_type == 3) { /* SUN Disk Label */
*first_partition = 2; *first_partition = 2;
*last_partition = 8; *last_partition = 8;
@ -4628,7 +4629,7 @@ int iso_count_appended_partitions(Ecma119Image *target,
{ {
int i, count= 0; int i, count= 0;
iso_tell_max_part_range(target, first_partition, last_partition); iso_tell_max_part_range(target->opts, first_partition, last_partition, 0);
for (i = *first_partition - 1; i <= *last_partition - 1; i++) { for (i = *first_partition - 1; i <= *last_partition - 1; i++) {
if (target->opts->appended_partitions[i] == NULL) if (target->opts->appended_partitions[i] == NULL)
continue; continue;

5
libisofs/ecma119.h
View File

@ -1058,7 +1058,8 @@ int iso_count_appended_partitions(Ecma119Image *target,
/* Determines the range of valid partition numbers depending on partition /* Determines the range of valid partition numbers depending on partition
table type. table type.
*/ */
void iso_tell_max_part_range(Ecma119Image *target, void iso_tell_max_part_range(IsoWriteOpts *opts,
int *first_partition, int *last_partition); int *first_partition, int *last_partition,
int flag);
#endif /*LIBISO_ECMA119_H_*/ #endif /*LIBISO_ECMA119_H_*/

9
libisofs/system_area.c
View File

@ -156,7 +156,7 @@ int iso_compute_append_partitions(Ecma119Image *t, int flag)
int first_partition, last_partition; int first_partition, last_partition;
uint32_t pos, size, add_pos = 0; uint32_t pos, size, add_pos = 0;
off_t start_byte, byte_count; off_t start_byte, byte_count;
char msg[80]; char msg[128];
sa_type = (t->system_area_options >> 2) & 0x3f; sa_type = (t->system_area_options >> 2) & 0x3f;
cyl_align = (t->system_area_options >> 8) & 0x3; cyl_align = (t->system_area_options >> 8) & 0x3;
@ -178,7 +178,7 @@ int iso_compute_append_partitions(Ecma119Image *t, int flag)
#endif #endif
iso_tell_max_part_range(t, &first_partition, &last_partition); iso_tell_max_part_range(t->opts, &first_partition, &last_partition, 0);
for (i = 0; i < ISO_MAX_PARTITIONS; i++) { for (i = 0; i < ISO_MAX_PARTITIONS; i++) {
if (t->opts->appended_partitions[i] == NULL) if (t->opts->appended_partitions[i] == NULL)
continue; continue;
@ -1874,7 +1874,7 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
sa_type = (t->system_area_options >> 2) & 0x3f; sa_type = (t->system_area_options >> 2) & 0x3f;
iso_tell_max_part_range(t, &first_partition, &last_partition); iso_tell_max_part_range(t->opts, &first_partition, &last_partition, 0);
for (i = first_partition - 1; i <= last_partition - 1; i++) for (i = first_partition - 1; i <= last_partition - 1; i++)
if (t->opts->appended_partitions[i] != NULL) { if (t->opts->appended_partitions[i] != NULL) {
will_append = 1; will_append = 1;
@ -3205,7 +3205,8 @@ static int partappend_writer_write_data(IsoImageWriter *writer)
target = writer->target; target = writer->target;
/* Append partition data */ /* Append partition data */
iso_tell_max_part_range(target, &first_partition, &last_partition); iso_tell_max_part_range(target->opts,
&first_partition, &last_partition, 0);
for (i = first_partition - 1; i <= last_partition - 1; i++) { for (i = first_partition - 1; i <= last_partition - 1; i++) {
if (target->opts->appended_partitions[i] == NULL) if (target->opts->appended_partitions[i] == NULL)