Fix gcc (4.0.x) warning about use of uninitialized variables.

Yhg1s · Yhg1s · commit 7f401ef73dbd · 2006-03-01T22:30:47.000Z
(PyMarshal_ReadShortFromFile() is only used in zipimport.c, I don't believe
the extra initializations will matter one way or another.)
diff --git a/Python/marshal.c b/Python/marshal.c
@@ -885,8 +885,9 @@ int
 PyMarshal_ReadShortFromFile(FILE *fp)
 {
 	RFILE rf;
+	assert(fp);
 	rf.fp = fp;
-	rf.strings = NULL;
+	rf.strings = rf.end = rf.ptr = NULL;
 	return r_short(&rf);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -885,8 +885,9 @@ int`
`885`	`885`	`PyMarshal_ReadShortFromFile(FILE *fp)`
`886`	`886`	`{`
`887`	`887`	`RFILE rf;`
	`888`	`+ assert(fp);`
`888`	`889`	`rf.fp = fp;`
`889`		`- rf.strings = NULL;`
	`890`	`+ rf.strings = rf.end = rf.ptr = NULL;`
`890`	`891`	`return r_short(&rf);`
`891`	`892`	`}`
`892`	`893`