tjh.dev
1diff --git i/src/mkimage.cc w/src/mkimage.cc
2index 02e65b1..b263796 100755
3--- i/src/mkimage.cc
4+++ w/src/mkimage.cc
5@@ -285,27 +285,27 @@ bostream& JigdoDescVec::put(bostream& file, MD5Sum* md) const {
6 //______________________________________________________________________
7
8 namespace {
9- const int SIZE_WIDTH = 12;
10+ const int MKIMAGE_SIZE_WIDTH = 12;
11 }
12
13 ostream& JigdoDesc::ImageInfo::put(ostream& s) const {
14- s << "image-info " << setw(SIZE_WIDTH) << size() << " "
15+ s << "image-info " << setw(MKIMAGE_SIZE_WIDTH) << size() << " "
16 << md5() << ' ' << blockLength() << '\n';
17 return s;
18 }
19 ostream& JigdoDesc::UnmatchedData::put(ostream& s) const {
20- s << "in-template " << setw(SIZE_WIDTH) << offset() << ' '
21- << setw(SIZE_WIDTH) << size() << '\n';
22+ s << "in-template " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
23+ << setw(MKIMAGE_SIZE_WIDTH) << size() << '\n';
24 return s;
25 }
26 ostream& JigdoDesc::MatchedFile::put(ostream& s) const {
27- s << "need-file " << setw(SIZE_WIDTH) << offset() << ' '
28- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
29+ s << "need-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
30+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
31 return s;
32 }
33 ostream& JigdoDesc::WrittenFile::put(ostream& s) const {
34- s << "have-file " << setw(SIZE_WIDTH) << offset() << ' '
35- << setw(SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
36+ s << "have-file " << setw(MKIMAGE_SIZE_WIDTH) << offset() << ' '
37+ << setw(MKIMAGE_SIZE_WIDTH) << size() << ' ' << md5() << ' ' << rsync() << '\n';
38 return s;
39 }
40