|
| 1 | +When using FfSetNoc() correctly, the equation |
| 2 | +FfCurrentRowSizeIo==FfTrueRowSize(FfNoc) will always hold. |
| 3 | +This patch replaces all calls to FfTrueRowSize(FfNoc). |
| 4 | +See trac ticket #23410. |
| 5 | + |
| 6 | +AUTHOR: |
| 7 | + |
| 8 | +- Simon King, 2015-09-26 |
| 9 | + |
| 10 | +From 19ad8271345e704423d242241380f321f0fdd97e Mon Sep 17 00:00:00 2001 |
| 11 | +From: Simon King < [email protected]> |
| 12 | +Date: Mon, 12 Sep 2016 12:31:47 +0200 |
| 13 | +Subject: [PATCH] Do not call FfTrueRowSize(FfNoc) |
| 14 | + |
| 15 | +--- |
| 16 | + src/ffio.c | 6 +++--- |
| 17 | + src/kernel-0.c | 6 +++--- |
| 18 | + src/mfread.c | 2 +- |
| 19 | + src/mfwrite.c | 2 +- |
| 20 | + src/zcmprow.c | 2 +- |
| 21 | + 5 files changed, 9 insertions(+), 9 deletions(-) |
| 22 | + |
| 23 | +diff --git a/src/ffio.c b/src/ffio.c |
| 24 | +index d2e3f1c..65fc2d1 100644 |
| 25 | +--- a/src/ffio.c |
| 26 | ++++ b/src/ffio.c |
| 27 | +@@ -68,7 +68,7 @@ int FfReadRows(FILE *f, PTR buf, int n) |
| 28 | + -------------------- */ |
| 29 | + for (i = 0; i < n; ++i) |
| 30 | + { |
| 31 | +- if (fread(b,FfTrueRowSize(FfNoc),1,f) != 1) break; |
| 32 | ++ if (fread(b,FfCurrentRowSizeIo,1,f) != 1) break; |
| 33 | + b += FfCurrentRowSize; |
| 34 | + } |
| 35 | + if (ferror(f)) |
| 36 | +@@ -106,7 +106,7 @@ int FfWriteRows(FILE *f, PTR buf, int n) |
| 37 | + --------------------- */ |
| 38 | + for (i = 0; i < n; ++i) |
| 39 | + { |
| 40 | +- if (fwrite(b,FfTrueRowSize(FfNoc),1,f) != 1) break; |
| 41 | ++ if (fwrite(b,FfCurrentRowSizeIo,1,f) != 1) break; |
| 42 | + b += FfCurrentRowSize; |
| 43 | + } |
| 44 | + if (ferror(f)) |
| 45 | +@@ -141,7 +141,7 @@ int FfSeekRow(FILE *f, int pos) |
| 46 | + long addr; |
| 47 | + |
| 48 | + if (FfOrder != -1) |
| 49 | +- addr = (long) FfTrueRowSize(FfNoc) * pos + 12; |
| 50 | ++ addr = (long) FfCurrentRowSizeIo * pos + 12; |
| 51 | + else |
| 52 | + addr = (long) FfNoc * 4 * pos + 12; |
| 53 | + if (SysFseek(f,addr) == -1) |
| 54 | +diff --git a/src/kernel-0.c b/src/kernel-0.c |
| 55 | +index 431f01a..bbab00b 100644 |
| 56 | +--- a/src/kernel-0.c |
| 57 | ++++ b/src/kernel-0.c |
| 58 | +@@ -638,7 +638,7 @@ PTR FfAddRow(PTR dest, PTR src) |
| 59 | + #else |
| 60 | + register BYTE *p1 = dest; |
| 61 | + register BYTE *p2 = src; |
| 62 | +- for (i = FfTrueRowSize(FfNoc); i != 0; --i) |
| 63 | ++ for (i = FfCurrentRowSizeIo; i != 0; --i) |
| 64 | + { |
| 65 | + register int x = *p2++; |
| 66 | + if (x != 0) *p1 = mtx_tadd[*p1][x]; |
| 67 | +@@ -787,7 +787,7 @@ PTR FfSubRow(PTR dest, PTR src) |
| 68 | + #else |
| 69 | + register FEL *p1 = dest; |
| 70 | + register FEL *p2 = src; |
| 71 | +- for (i = FfTrueRowSize(FfNoc); i != 0; --i) |
| 72 | ++ for (i = FfCurrentRowSizeIo; i != 0; --i) |
| 73 | + { |
| 74 | + register int x = *p2++; |
| 75 | + if (x != 0) *p1 = mtx_tadd[*p1][table_inv[x]]; |
| 76 | +@@ -999,7 +999,7 @@ void FfMulRow(PTR row, FEL mark) |
| 77 | + { |
| 78 | + multab = mtx_tmult[mark]; |
| 79 | + m = row; |
| 80 | +- for (i = FfTrueRowSize(FfNoc); i != 0; --i) |
| 81 | ++ for (i = FfCurrentRowSizeIo; i != 0; --i) |
| 82 | + { |
| 83 | + register int x = *m; |
| 84 | + if (x != 0) *m = multab[x]; |
| 85 | +diff --git a/src/mfread.c b/src/mfread.c |
| 86 | +index ce576f4..4d2a076 100644 |
| 87 | +--- a/src/mfread.c |
| 88 | ++++ b/src/mfread.c |
| 89 | +@@ -59,7 +59,7 @@ int MfReadRows(MtxFile_t *f, PTR buf, int nrows) |
| 90 | + -------------------- */ |
| 91 | + for (i = 0; i < nrows; ++i) |
| 92 | + { |
| 93 | +- if (fread(b,FfTrueRowSize(FfNoc),1,f->File) != 1) break; |
| 94 | ++ if (fread(b,FfCurrentRowSizeIo,1,f->File) != 1) break; |
| 95 | + b += FfCurrentRowSize; |
| 96 | + } |
| 97 | + if (ferror(f->File)) |
| 98 | +diff --git a/src/mfwrite.c b/src/mfwrite.c |
| 99 | +index cf24541..41fc181 100644 |
| 100 | +--- a/src/mfwrite.c |
| 101 | ++++ b/src/mfwrite.c |
| 102 | +@@ -58,7 +58,7 @@ int MfWriteRows(MtxFile_t *f, PTR buf, int nrows) |
| 103 | + --------------------- */ |
| 104 | + for (i = 0; i < nrows; ++i) |
| 105 | + { |
| 106 | +- if (fwrite(b,FfTrueRowSize(FfNoc),1,f->File) != 1) |
| 107 | ++ if (fwrite(b,FfCurrentRowSizeIo,1,f->File) != 1) |
| 108 | + break; |
| 109 | + b += FfCurrentRowSize; |
| 110 | + } |
| 111 | +diff --git a/src/zcmprow.c b/src/zcmprow.c |
| 112 | +index f9fe2a5..c4faff4 100644 |
| 113 | +--- a/src/zcmprow.c |
| 114 | ++++ b/src/zcmprow.c |
| 115 | +@@ -36,7 +36,7 @@ |
| 116 | + |
| 117 | + int FfCmpRows(PTR p1, PTR p2) |
| 118 | + { |
| 119 | +- return memcmp(p1,p2,FfTrueRowSize(FfNoc)); |
| 120 | ++ return memcmp(p1,p2,FfCurrentRowSizeIo); |
| 121 | + } |
| 122 | + |
| 123 | + /** |
| 124 | +-- |
| 125 | +2.5.0 |
| 126 | + |
0 commit comments