summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>2001-10-19 01:46:21 (GMT)
committerGuido van Rossum <guido@python.org>2001-10-19 01:46:21 (GMT)
commitb8cf3e64beefc65b462324efa09c85e85bdba7c2 (patch)
tree5c02b31d991008d73ecd1a357b7b5ba272f20c1b
parentc524d952da928f745203876f2e67f651c2bc7246 (diff)
downloadcpython-b8cf3e64beefc65b462324efa09c85e85bdba7c2.zip
cpython-b8cf3e64beefc65b462324efa09c85e85bdba7c2.tar.gz
cpython-b8cf3e64beefc65b462324efa09c85e85bdba7c2.tar.bz2
SF patch #470393 (Jim Ahlstrom): Add missing marshal function
In Include/, marshal.h declares both PyMarshal_ReadLongFromFile() and PyMarshal_ReadShortFromFile(), but the second is missing from marshal.c. [Shouldn't the return type be declared as 'short' instead of 'int'? But 'int' is what was in marshal.h all those years... --Guido]
-rw-r--r--Python/marshal.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/Python/marshal.c b/Python/marshal.c
index 944ae35..806b91c 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -635,6 +635,14 @@ r_object(RFILE *p)
}
}
+int
+PyMarshal_ReadShortFromFile(FILE *fp)
+{
+ RFILE rf;
+ rf.fp = fp;
+ return r_short(&rf);
+}
+
long
PyMarshal_ReadLongFromFile(FILE *fp)
{