Commit b2f524ae authored by Guido van Rossum's avatar Guido van Rossum

fixed StandardGetFile argument handling

parent d56c1092
...@@ -405,27 +405,20 @@ mfs_StandardGetFile(self, args) ...@@ -405,27 +405,20 @@ mfs_StandardGetFile(self, args)
object *self; /* Not used */ object *self; /* Not used */
object *args; object *args;
{ {
char *list[4]; SFTypeList list;
SFTypeList typelist;
short numtypes; short numtypes;
StandardFileReply reply; StandardFileReply reply;
list[0] = list[1] = list[2] = list[3] = 0; list[0] = list[1] = list[2] = list[3] = 0;
numtypes = 0; numtypes = 0;
#if 0 if (!newgetargs(args, "|O&O&O&O&", PyMac_GetOSType, &list[0],
/* XXXX Why doesn't this work? */
if (!newgetargs(args, "|O&|O&|O&|O&", PyMac_GetOSType, &list[0],
PyMac_GetOSType, &list[1], PyMac_GetOSType, &list[2], PyMac_GetOSType, &list[1], PyMac_GetOSType, &list[2],
PyMac_GetOSType, &list[3]) ) PyMac_GetOSType, &list[3]) )
return NULL; return NULL;
#else while ( numtypes < 4 && list[numtypes] ) {
if (!newgetargs(args, "|O&", PyMac_GetOSType, &list[0]) )
return NULL;
#endif
while ( list[numtypes] && numtypes < 4 ) {
numtypes++; numtypes++;
} }
StandardGetFile((FileFilterUPP)0, numtypes, typelist, &reply); StandardGetFile((FileFilterUPP)0, numtypes, list, &reply);
return mkvalue("(Oi)", newmfssobject(&reply.sfFile), reply.sfGood); return mkvalue("(Oi)", newmfssobject(&reply.sfFile), reply.sfGood);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment