summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
author Miodrag Milanovic <mmicko@gmail.com>2015-12-04 10:29:21 +0100
committer Miodrag Milanovic <mmicko@gmail.com>2015-12-04 10:29:21 +0100
commit1b0ec08af5cd3b3268b5889ba4e30409431434e2 (patch)
tree42c510afaaeb15e1f97eff044a4d295586c30aaa /src/lib
parent5a2f80dcde2e76356bf568f1e2d71b054a7db45b (diff)
clang-modernize part 6
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/formats/ap2_dsk.cpp20
-rw-r--r--src/lib/formats/ap_dsk35.cpp4
-rw-r--r--src/lib/formats/cassimg.cpp4
-rw-r--r--src/lib/formats/flopimg.cpp12
4 files changed, 20 insertions, 20 deletions
diff --git a/src/lib/formats/ap2_dsk.cpp b/src/lib/formats/ap2_dsk.cpp
index cfc9b5350ef..49010ff62e1 100644
--- a/src/lib/formats/ap2_dsk.cpp
+++ b/src/lib/formats/ap2_dsk.cpp
@@ -774,9 +774,9 @@ bool a2_16sect_format::save(io_generic *io, floppy_image *image)
#define DATAGOOD 8
// data postamble is good
#define DATAPOST 16
- for (int i = 0; i < 16; i++) {
+ for (auto & elem : visualgrid) {
for (int j = 0; j < 35; j++) {
- visualgrid[i][j] = 0;
+ elem[j] = 0;
}
}
image->get_actual_geometry(g_tracks, g_heads);
@@ -822,8 +822,8 @@ bool a2_16sect_format::save(io_generic *io, floppy_image *image)
if(hb == 4) {
UINT8 h[11];
- for(int i=0; i<11; i++)
- h[i] = gb(buf, ts, pos, wrap);
+ for(auto & elem : h)
+ elem = gb(buf, ts, pos, wrap);
//UINT8 v2 = gcr6bw_tb[h[2]];
UINT8 vl = gcr4_decode(h[0],h[1]);
UINT8 tr = gcr4_decode(h[2],h[3]);
@@ -1140,9 +1140,9 @@ bool a2_rwts18_format::save(io_generic *io, floppy_image *image)
#define DATAGOOD 8
// data postamble is good
#define DATAPOST 16
- for (int i = 0; i < 18; i++) {
+ for (auto & elem : visualgrid) {
for (int j = 0; j < 35; j++) {
- visualgrid[i][j] = 0;
+ elem[j] = 0;
}
}
image->get_actual_geometry(g_tracks, g_heads);
@@ -1182,8 +1182,8 @@ bool a2_rwts18_format::save(io_generic *io, floppy_image *image)
if(hb == 4) {
UINT8 h[11];
- for(int i=0; i<11; i++)
- h[i] = gb(buf, ts, pos, wrap);
+ for(auto & elem : h)
+ elem = gb(buf, ts, pos, wrap);
//UINT8 v2 = gcr6bw_tb[h[2]];
UINT8 vl = gcr4_decode(h[0],h[1]);
UINT8 tr = gcr4_decode(h[2],h[3]);
@@ -1345,8 +1345,8 @@ bool a2_rwts18_format::save(io_generic *io, floppy_image *image)
oldpos=pos;
UINT8 h[7];
// grab exactly 7 bytes: should be Track, Sector, Checksum, AA, FF and FF and the Br0derbund Title ID
- for(int i=0; i<7; i++)
- h[i] = gb(buf, ts, pos, wrap);
+ for(auto & elem : h)
+ elem = gb(buf, ts, pos, wrap);
UINT8 tr = gcr6bw_tb[h[0]];
UINT8 se = gcr6bw_tb[h[1]];
UINT8 chk = gcr6bw_tb[h[2]];
diff --git a/src/lib/formats/ap_dsk35.cpp b/src/lib/formats/ap_dsk35.cpp
index 385ff326047..ff8cef2e08a 100644
--- a/src/lib/formats/ap_dsk35.cpp
+++ b/src/lib/formats/ap_dsk35.cpp
@@ -1410,8 +1410,8 @@ bool dc42_format::save(io_generic *io, floppy_image *image)
if(hb == 4) {
UINT8 h[7];
- for(int i=0; i<7; i++)
- h[i] = gb(buf, ts, pos, wrap);
+ for(auto & elem : h)
+ elem = gb(buf, ts, pos, wrap);
UINT8 v2 = gcr6bw_tb[h[2]];
UINT8 v3 = gcr6bw_tb[h[3]];
UINT8 tr = gcr6bw_tb[h[0]] | (v2 & 1 ? 0x40 : 0x00);
diff --git a/src/lib/formats/cassimg.cpp b/src/lib/formats/cassimg.cpp
index aabc13ee393..7fe1bcec81b 100644
--- a/src/lib/formats/cassimg.cpp
+++ b/src/lib/formats/cassimg.cpp
@@ -278,8 +278,8 @@ void cassette_close(cassette_image *cassette)
{
if ((cassette->flags & CASSETTE_FLAG_DIRTY) && (cassette->flags & CASSETTE_FLAG_SAVEONEXIT))
cassette_save(cassette);
- for (unsigned int i = 0; i < cassette->blocks.size(); i++)
- global_free(cassette->blocks[i]);
+ for (auto & elem : cassette->blocks)
+ global_free(elem);
global_free(cassette);
}
}
diff --git a/src/lib/formats/flopimg.cpp b/src/lib/formats/flopimg.cpp
index fa10ab3e4a9..57281fcda0e 100644
--- a/src/lib/formats/flopimg.cpp
+++ b/src/lib/formats/flopimg.cpp
@@ -1763,8 +1763,8 @@ void floppy_image_format_t::generate_track_from_levels(int track, int head, std:
// Also check if all MG values are valid
int transition_count = 0;
- for(unsigned int i=0; i<trackbuf.size(); i++) {
- switch(trackbuf[i] & floppy_image::MG_MASK) {
+ for(auto & elem : trackbuf) {
+ switch(elem & floppy_image::MG_MASK) {
case MG_1:
transition_count++;
break;
@@ -1809,9 +1809,9 @@ void floppy_image_format_t::generate_track_from_levels(int track, int head, std:
UINT32 cbit = floppy_image::MG_A;
UINT32 count = 0;
- for(unsigned int i=0; i<trackbuf.size(); i++) {
- UINT32 bit = trackbuf[i] & floppy_image::MG_MASK;
- UINT32 time = trackbuf[i] & floppy_image::TIME_MASK;
+ for(auto & elem : trackbuf) {
+ UINT32 bit = elem & floppy_image::MG_MASK;
+ UINT32 time = elem & floppy_image::TIME_MASK;
if(bit == MG_0) {
count += time;
continue;
@@ -1824,7 +1824,7 @@ void floppy_image_format_t::generate_track_from_levels(int track, int head, std:
continue;
}
dest.push_back(cbit | count);
- dest.push_back(trackbuf[i]);
+ dest.push_back(elem);
count = 0;
}