Message ID | 20170515203114.9477-4-hpoussin@reactos.org |
---|---|
State | New |
Headers | show |
Am 15.05.2017 um 22:31 hat Hervé Poussineau geschrieben: > Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> > --- > block/vvfat.c | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/block/vvfat.c b/block/vvfat.c > index 002bd86e42..57f2489689 100644 > --- a/block/vvfat.c > +++ b/block/vvfat.c > @@ -404,9 +404,9 @@ static void init_mbr(BDRVVVFATState *s, int cyls, int heads, int secs) > /* FAT12/FAT16/FAT32 */ > /* DOS uses different types when partition is LBA, > probably to prevent older versions from using CHS on them */ > - partition->fs_type= s->fat_type==12 ? 0x1: > - s->fat_type==16 ? (lba?0xe:0x06): > - /*fat_tyoe==32*/ (lba?0xc:0x0b); > + partition->fs_type = s->fat_type == 12 ? 0x1 : > + s->fat_type == 16 ? (lba ? 0xe : 0x06) : > + /*s->fat_type == 32*/ (lba ? 0xc : 0x0b); > > real_mbr->magic[0]=0x55; real_mbr->magic[1]=0xaa; > } > @@ -806,7 +806,7 @@ static int read_directory(BDRVVVFATState* s, int mapping_index) > (ROOT_ENTRIES - cur) * sizeof(direntry_t)); > } > > - /* reget the mapping, since s->mapping was possibly realloc()ed */ > + /* reset the mapping, since s->mapping was possibly realloc()ed */ Are you sure that this was a typo? It seems to make more sense to me as "re-get" (maybe easer to read with the hyphen). > mapping = array_get(&(s->mapping), mapping_index); > first_cluster += (s->directory.next - mapping->info.dir.first_dir_index) > * 0x20 / s->cluster_size; Kevin
Le 16/05/2017 à 15:21, Kevin Wolf a écrit : > Am 15.05.2017 um 22:31 hat Hervé Poussineau geschrieben: >> @@ -806,7 +806,7 @@ static int read_directory(BDRVVVFATState* s, int mapping_index) >> (ROOT_ENTRIES - cur) * sizeof(direntry_t)); >> } >> >> - /* reget the mapping, since s->mapping was possibly realloc()ed */ >> + /* reset the mapping, since s->mapping was possibly realloc()ed */ > > Are you sure that this was a typo? It seems to make more sense to me as > "re-get" (maybe easer to read with the hyphen). IMO, both are valid. But I'll change it to "re-get" for v2. > >> mapping = array_get(&(s->mapping), mapping_index); >> first_cluster += (s->directory.next - mapping->info.dir.first_dir_index) >> * 0x20 / s->cluster_size; > > Kevin >
diff --git a/block/vvfat.c b/block/vvfat.c index 002bd86e42..57f2489689 100644 --- a/block/vvfat.c +++ b/block/vvfat.c @@ -404,9 +404,9 @@ static void init_mbr(BDRVVVFATState *s, int cyls, int heads, int secs) /* FAT12/FAT16/FAT32 */ /* DOS uses different types when partition is LBA, probably to prevent older versions from using CHS on them */ - partition->fs_type= s->fat_type==12 ? 0x1: - s->fat_type==16 ? (lba?0xe:0x06): - /*fat_tyoe==32*/ (lba?0xc:0x0b); + partition->fs_type = s->fat_type == 12 ? 0x1 : + s->fat_type == 16 ? (lba ? 0xe : 0x06) : + /*s->fat_type == 32*/ (lba ? 0xc : 0x0b); real_mbr->magic[0]=0x55; real_mbr->magic[1]=0xaa; } @@ -806,7 +806,7 @@ static int read_directory(BDRVVVFATState* s, int mapping_index) (ROOT_ENTRIES - cur) * sizeof(direntry_t)); } - /* reget the mapping, since s->mapping was possibly realloc()ed */ + /* reset the mapping, since s->mapping was possibly realloc()ed */ mapping = array_get(&(s->mapping), mapping_index); first_cluster += (s->directory.next - mapping->info.dir.first_dir_index) * 0x20 / s->cluster_size;
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org> --- block/vvfat.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)