X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;f=tools%2Ffirmware-utils%2Fsrc%2Fptgen.c;h=ce93016667e1715457650f5bb34224ccdcc5abe1;hb=c634ebe6f0f9c8030f03c5cd32d4de8e9e0c3fea;hp=2d78eae53514cdcfa6f1d9f54b45a8f351ff8d6a;hpb=19021c16ffef5393aebedf009c57a86b11b996c2;p=openwrt-10.03%2F.git diff --git a/tools/firmware-utils/src/ptgen.c b/tools/firmware-utils/src/ptgen.c index 2d78eae53..ce9301666 100644 --- a/tools/firmware-utils/src/ptgen.c +++ b/tools/firmware-utils/src/ptgen.c @@ -114,7 +114,7 @@ static void to_chs(long sect, unsigned char chs[3]) { static inline unsigned long round_to_cyl(long sect) { int cyl_size = heads * sectors; - return sect + cyl_size - ((sect % cyl_size) ?: cyl_size); + return sect + cyl_size - (sect % cyl_size); } /* check the partition sizes and write the partition table */ @@ -141,6 +141,7 @@ static int gen_ptable(int nr) fprintf(stderr, "Partition %d: start=%ld, end=%ld, size=%ld\n", i, (long) start * 512, ((long) start + (long) len) * 512, (long) len * 512); printf("%ld\n", ((long) start * 512)); } + printf("%ld\n", ((long) (start + len) * 512)); if ((fd = open(filename, O_WRONLY|O_CREAT, 0644)) < 0) { fprintf(stderr, "Can't open output file '%s'\n",filename);