SF patch #470393 (Jim Ahlstrom): Add missing marshal function

gvanrossum · gvanrossum · commit b8cf3e64beef · 2001-10-19T01:46:21.000Z
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]
diff --git 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)
 {

Original file line number	Diff line number	Diff line change
`@@ -635,6 +635,14 @@ r_object(RFILE *p)`
`635`	`635`	`}`
`636`	`636`	`}`
`637`	`637`
	`638`	`+int`
	`639`	`+PyMarshal_ReadShortFromFile(FILE *fp)`
	`640`	`+{`
	`641`	`+ RFILE rf;`
	`642`	`+ rf.fp = fp;`
	`643`	`+ return r_short(&rf);`
	`644`	`+}`
	`645`	`+`
`638`	`646`	`long`
`639`	`647`	`PyMarshal_ReadLongFromFile(FILE *fp)`
`640`	`648`	`{`