* Changed many files to use mkvalue() instead of newtupleobject().
* Fixcprt.py: added [-y file] option, do only files younger than file.
* modsupport.[ch]: added vmkvalue().
* intobject.c: use mkvalue().
* stringobject.c: added "formatstring"; renamed string* to string_*;
ceval.c: call formatstring for string % value.
* longobject.c: close memory leak in divmod.
* parsetok.c: set result node to NULL when returning an error.
diff --git a/Modules/fmmodule.c b/Modules/fmmodule.c
index f3df6ce..8d54d97 100644
--- a/Modules/fmmodule.c
+++ b/Modules/fmmodule.c
@@ -1,6 +1,6 @@
/***********************************************************
-Copyright 1991, 1992 by Stichting Mathematisch Centrum, Amsterdam, The
-Netherlands.
+Copyright 1991, 1992, 1993 by Stichting Mathematisch Centrum,
+Amsterdam, The Netherlands.
All Rights Reserved
@@ -134,22 +134,15 @@
err_setstr(RuntimeError, "error in fmgetfontinfo");
return NULL;
}
- v = newtupleobject(8);
- if (v == NULL)
- return NULL;
-#define SET(i, member) settupleitem(v, i, newintobject(info.member))
- SET(0, printermatched);
- SET(1, fixed_width);
- SET(2, xorig);
- SET(3, yorig);
- SET(4, xsize);
- SET(5, ysize);
- SET(6, height);
- SET(7, nglyphs);
-#undef SET
- if (err_occurred())
- return NULL;
- return v;
+ return mkvalue("(llllllll)",
+ info.printermatched,
+ info.fixed_width,
+ info.xorig,
+ info.yorig,
+ info.xsize,
+ info.ysize,
+ info.height,
+ info.nglyphs);
}
#if 0