Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

in ErrorMayQuit calls, replace %i by %d #48

Merged
merged 2 commits into from
Sep 17, 2024
Merged

in ErrorMayQuit calls, replace %i by %d #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f324385
in `ErrorMayQuit` calls, replace `%i` by `%d`
ThomasBreuer Sep 9, 2024
d785ccc
fix a typo
ThomasBreuer Sep 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/bitstring.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ static Obj FuncMTX64_RowSelectShifted(Obj self, Obj bitstring, Obj m,
UInt nor = HeaderOfMatrix(m)->nor;
UInt noc = HeaderOfMatrix(m)->noc;
if (nor != ishift + DataOfBitStringObject(bitstring)[0])
ErrorMayQuit("mismatched matrix length: matrix %i, bitstring + shift %i",
ErrorMayQuit("mismatched matrix length: matrix %d, bitstring + shift %d",
nor, ishift + DataOfBitStringObject(bitstring)[0]);
UInt nos = DataOfBitStringObject(bitstring)[1];
Obj fld = FieldOfMatrix(m);
Expand Down
4 changes: 2 additions & 2 deletions src/meataxe64.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -509,11 +509,11 @@ static Obj FuncMTX64_ELMS_LIST(Obj self, Obj m, Obj rows) {
for (UInt i = 1; i <= nor2; i++) {
Obj ix = ELM_LIST(rows, i);
if (!IS_INTOBJ(ix))
ErrorMayQuit("MTX64_ELMS_LIST: row index %i must be a small integer,"
ErrorMayQuit("MTX64_ELMS_LIST: row index %d must be a small integer,"
" not a %s", i, (Int)TNAM_OBJ(ix));
Int ixi = INT_INTOBJ(ix);
if (0 >= ixi || nor < ixi)
ErrorMayQuit("MTX64_ELMS_LIST: row index %i out of range",
ErrorMayQuit("MTX64_ELMS_LIST: row index %d out of range",
i, 0);
Dfmt *d1 = DPAdv(&ds, ixi-1, d);
DCpy(&ds, d1, 1, d2);
Expand Down
6 changes: 3 additions & 3 deletions src/meataxe64.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ static inline void CHECK_MTX64_RowCount(Obj row, Obj m) {
static inline void CHECK_MTX64_RowRange(Obj startrow, Obj nrows, Obj m) {
CHECK_NONNEG_SMALLINTS(startrow, nrows);
if (INT_INTOBJ(startrow) + INT_INTOBJ(nrows) > HeaderOfMatrix(m)->nor)
ErrorMayQuit("Meataxe64: row range too large for matrix: %i %i",
ErrorMayQuit("Meataxe64: row range too large for matrix: %d %d",
INT_INTOBJ(startrow) + INT_INTOBJ(nrows),
HeaderOfMatrix(m)->nor);
}
Expand All @@ -185,14 +185,14 @@ static inline void CHECK_SUBFIELD(Obj bigfield, Obj smallfield) {
UInt qb = DataOfFieldObject(bigfield)->fdef;
UInt qs = DataOfFieldObject(smallfield)->fdef;
if (qb % qs != 0) {
ErrorMayQuit("Meataxe64: incompatiable field sizes %i %i",qb,qs);
ErrorMayQuit("Meataxe64: incompatible field sizes %d %d",qb,qs);
}
UInt x = qs;
while (x < qb) {
x *= qs;
}
if (x > qb) {
ErrorMayQuit("Meataxe64: incompatible field sizes %i %i",qb,qs);
ErrorMayQuit("Meataxe64: incompatible field sizes %d %d",qb,qs);
}
}

Expand Down
Loading