diff options
Diffstat (limited to 'src/lib')
| -rw-r--r-- | src/lib/formats/c3040_dsk.c | 6 | ||||
| -rw-r--r-- | src/lib/formats/c4040_dsk.c | 6 | ||||
| -rw-r--r-- | src/lib/formats/c8280_dsk.c | 46 | ||||
| -rw-r--r-- | src/lib/formats/flopimg.c | 8 | ||||
| -rw-r--r-- | src/lib/formats/imd_dsk.c | 22 | ||||
| -rw-r--r-- | src/lib/util/corestr.c | 4 | ||||
| -rw-r--r-- | src/lib/util/hashing.c | 2 | ||||
| -rw-r--r-- | src/lib/util/zippath.c | 2 |
8 files changed, 48 insertions, 48 deletions
diff --git a/src/lib/formats/c3040_dsk.c b/src/lib/formats/c3040_dsk.c index dd1d3ee5817..9fb6669ab20 100644 --- a/src/lib/formats/c3040_dsk.c +++ b/src/lib/formats/c3040_dsk.c @@ -51,9 +51,9 @@ const int c3040_format::c3040_sectors_per_track[] = const int c3040_format::c3040_gap2[] = { 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, // 1-17 - 8, 8, 8, 8, 8, 8, 8, // 18-24 - 15, 15, 15, 15, 15, 15, // 25-30 - 12, 12, 12, 12, 12 // 31-35 + 8, 8, 8, 8, 8, 8, 8, // 18-24 + 15, 15, 15, 15, 15, 15, // 25-30 + 12, 12, 12, 12, 12 // 31-35 }; floppy_image_format_t::desc_e* c3040_format::get_sector_desc(const format &f, int ¤t_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2) diff --git a/src/lib/formats/c4040_dsk.c b/src/lib/formats/c4040_dsk.c index 4def7e0c581..9e6dff7f627 100644 --- a/src/lib/formats/c4040_dsk.c +++ b/src/lib/formats/c4040_dsk.c @@ -41,9 +41,9 @@ const c4040_format::format c4040_format::file_formats[] = { const int c4040_format::c4040_gap2[] = { 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, // 1-17 - 19, 19, 19, 19, 19, 19, 19, // 18-24 - 15, 15, 15, 15, 15, 15, // 25-30 - 12, 12, 12, 12, 12 // 31-35 + 19, 19, 19, 19, 19, 19, 19, // 18-24 + 15, 15, 15, 15, 15, 15, // 25-30 + 12, 12, 12, 12, 12 // 31-35 }; floppy_image_format_t::desc_e* c4040_format::get_sector_desc(const format &f, int ¤t_size, int sector_count, UINT8 id1, UINT8 id2, int gap_2) diff --git a/src/lib/formats/c8280_dsk.c b/src/lib/formats/c8280_dsk.c index b6a25dcc924..cb39b5c3ea5 100644 --- a/src/lib/formats/c8280_dsk.c +++ b/src/lib/formats/c8280_dsk.c @@ -30,32 +30,32 @@ const char *c8280_format::extensions() const } const c8280_format::format c8280_format::formats[] = { - // 80x4e 12x00 3xf6 fc + // 80x4e 12x00 3xf6 fc // 50x4e 12x00 3xf5 fe 2x00 01 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 // 54x4e 12x00 3xf5 fe 2x00 02 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 // 54x4e 12x00 3xf5 fe 2x00 03 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 04 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 05 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 06 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 07 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 08 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 09 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 0a 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 0b 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 0c 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 0d 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 0e 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 0f 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 10 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 11 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 12 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 13 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 14 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 15 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 16 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 17 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 18 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 - // 54x4e 12x00 3xf5 fe 2x00 19 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 04 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 05 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 06 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 07 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 08 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 09 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 0a 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 0b 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 0c 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 0d 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 0e 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 0f 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 10 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 11 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 12 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 13 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 14 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 15 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 16 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 17 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 18 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 + // 54x4e 12x00 3xf5 fe 2x00 19 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 // 54x4e 12x00 3xf5 fe 2x00 1a 01 f7 22x4e 12x00 3xf5 fb 256xaa f7 // 653x4e { diff --git a/src/lib/formats/flopimg.c b/src/lib/formats/flopimg.c index 4588d717c00..35ab1af359d 100644 --- a/src/lib/formats/flopimg.c +++ b/src/lib/formats/flopimg.c @@ -2835,7 +2835,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_gcr5(const UINT8 *bit for(int i=0; i<track_size; i++) { int bit = sbit_r(bitstream, i); shift_reg = ((shift_reg << 1) | bit) & 0x3ff; - + if (sync && !bit) { UINT8 id = sbyte_gcr5_r(bitstream, i, track_size); @@ -2844,7 +2844,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_gcr5(const UINT8 *bit if(hblk_count < 100) hblk[hblk_count++] = i-10; break; - + case 0x07: if(dblk_count < 100) dblk[dblk_count++] = i-10; @@ -2914,7 +2914,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_victor_gcr5(const UIN for(int i=0; i<track_size; i++) { int bit = sbit_r(bitstream, i); shift_reg = ((shift_reg << 1) | bit) & 0x3ff; - + if (sync && !bit) { UINT8 id = sbyte_gcr5_r(bitstream, i, track_size); @@ -2923,7 +2923,7 @@ void floppy_image_format_t::extract_sectors_from_bitstream_victor_gcr5(const UIN if(hblk_count < 100) hblk[hblk_count++] = i-10; break; - + case 0x08: if(dblk_count < 100) dblk[dblk_count++] = i-10; diff --git a/src/lib/formats/imd_dsk.c b/src/lib/formats/imd_dsk.c index 97942e29826..8600590c735 100644 --- a/src/lib/formats/imd_dsk.c +++ b/src/lib/formats/imd_dsk.c @@ -137,15 +137,15 @@ static floperr_t imd_read_indexed_sector(floppy_image_legacy *floppy, int head, static floperr_t imd_expand_file(floppy_image_legacy *floppy , UINT64 offset , size_t amount) { - if (amount == 0) { - return FLOPPY_ERROR_SUCCESS; - } + if (amount == 0) { + return FLOPPY_ERROR_SUCCESS; + } - UINT64 file_size = floppy_image_size(floppy); + UINT64 file_size = floppy_image_size(floppy); - if (offset > file_size) { - return FLOPPY_ERROR_INTERNAL; - } + if (offset > file_size) { + return FLOPPY_ERROR_INTERNAL; + } UINT64 size_after_off = file_size - offset; @@ -466,10 +466,10 @@ bool imd_format::load(io_generic *io, UINT32 form_factor, floppy_image *image) for(int i=0; i<sector_count; i++) { UINT8 stype = img[pos++]; - sects[i].track = tnum ? tnum[i] : track; - sects[i].head = hnum ? hnum[i] : head; - sects[i].sector = snum[i]; - sects[i].size = ssize; + sects[i].track = tnum ? tnum[i] : track; + sects[i].head = hnum ? hnum[i] : head; + sects[i].sector = snum[i]; + sects[i].size = ssize; sects[i].actual_size = actual_size; if(stype == 0 || stype > 8) { diff --git a/src/lib/util/corestr.c b/src/lib/util/corestr.c index 7e42e235065..8a78a672ac6 100644 --- a/src/lib/util/corestr.c +++ b/src/lib/util/corestr.c @@ -193,7 +193,7 @@ char *core_i64_format(UINT64 value, UINT8 mindigits, bool is_octal) } /*------------------------------------------------- - std::string helpers + std::string helpers -------------------------------------------------*/ #include <algorithm> @@ -312,4 +312,4 @@ int strreplace(std::string &str, const std::string& search, const std::string& r str.erase(curindex, searchlen).insert(curindex, replace); } return matches; -}
\ No newline at end of file +} diff --git a/src/lib/util/hashing.c b/src/lib/util/hashing.c index b4e2b7a9d6d..1481de34a12 100644 --- a/src/lib/util/hashing.c +++ b/src/lib/util/hashing.c @@ -167,7 +167,7 @@ bool crc32_t::from_string(const char *string, int length) //------------------------------------------------- const char *crc32_t::as_string(std::string &buffer) const -{ +{ strprintf(buffer, "%08x", m_raw); return buffer.c_str(); } diff --git a/src/lib/util/zippath.c b/src/lib/util/zippath.c index fdb5a3b957d..e4433ac0fc4 100644 --- a/src/lib/util/zippath.c +++ b/src/lib/util/zippath.c @@ -332,7 +332,7 @@ file_error zippath_fopen(const char *filename, UINT32 openflags, core_file *&fil temp2.assign(mainpath).append(PATH_SEPARATOR).append(subpath); subpath.assign(temp2); } - else + else { mainpath = mainpath.substr(temp.length()); subpath.assign(mainpath); |
