Converted manually written code to the new K format specifier.

jackjansen · jackjansen · commit ecc6635ae444 · 2003-04-17T20:40:07.000Z
Untested, but at least it still compiles.
diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
@@ -167,10 +167,10 @@ filldialogoptions(PyObject *d,
 			}
 			*defaultLocationP = defaultLocation_storage;
 		} else if( strcmp(keystr, "version") == 0 ) {
-			if ( !PyArg_Parse(value, "h", &opt->version) )
+			if ( !PyArg_Parse(value, "H", &opt->version) )
 				return 0;
 		} else if( strcmp(keystr, "dialogOptionFlags") == 0 ) {
-			if ( !PyArg_Parse(value, "l", &opt->dialogOptionFlags) )
+			if ( !PyArg_Parse(value, "K", &opt->dialogOptionFlags) )
 				return 0;
 		} else if( strcmp(keystr, "location") == 0 ) {
 			if ( !PyArg_Parse(value, "O&", PyMac_GetPoint, &opt->location) )
@@ -247,7 +247,7 @@ nav_NavTranslateFile(navrrobject *self, PyObject *args)
 	NavTranslationOptions howToTranslate;
 	OSErr err;
 
-	if (!PyArg_ParseTuple(args, "l", &howToTranslate))
+	if (!PyArg_ParseTuple(args, "K", &howToTranslate))
 		return NULL;
 	err = NavTranslateFile(&self->itself, howToTranslate);
 	if ( err ) {
@@ -268,7 +268,7 @@ nav_NavCompleteSave(navrrobject *self, PyObject *args)
 	NavTranslationOptions howToTranslate;
 	OSErr err;
 
-	if (!PyArg_ParseTuple(args, "l", &howToTranslate))
+	if (!PyArg_ParseTuple(args, "K", &howToTranslate))
 		return NULL;
 	err = NavCompleteSave(&self->itself, howToTranslate);
 	if ( err ) {
@@ -528,7 +528,7 @@ nav_NavAskSaveChanges(PyObject *self, PyObject *args, PyObject *kw)
 	OSErr err;
 
 	if ( kw && PyObject_IsTrue(kw) ) {
-		if (!PyArg_ParseTuple(args, "l", &action))
+		if (!PyArg_ParseTuple(args, "K", &action))
 			return NULL;
 		dict = kw;
 	} else if (!PyArg_ParseTuple(args, "lO!", &action, &PyDict_Type, &dict))
diff --git a/Mac/Modules/scrap/_Scrapmodule.c b/Mac/Modules/scrap/_Scrapmodule.c
@@ -138,7 +138,7 @@ static PyObject *ScrapObj_PutScrapFlavor(ScrapObject *_self, PyObject *_args)
 	ScrapFlavorFlags flavorFlags;
 	char *flavorData__in__;
 	int flavorData__in_len__;
-	if (!PyArg_ParseTuple(_args, "O&ls#",
+	if (!PyArg_ParseTuple(_args, "O&Ks#",
 	                      PyMac_GetOSType, &flavorType,
 	                      &flavorFlags,
 	                      &flavorData__in__, &flavorData__in_len__))
diff --git a/Python/mactoolboxglue.c b/Python/mactoolboxglue.c
@@ -415,7 +415,7 @@ PyMac_BuildPoint(Point p)
 int
 PyMac_GetEventRecord(PyObject *v, EventRecord *e)
 {
-	return PyArg_Parse(v, "(Hll(hh)H)",
+	return PyArg_Parse(v, "(HKK(hh)H)",
 	                   &e->what,
 	                   &e->message,
 	                   &e->when,
@@ -471,7 +471,7 @@ PyMac_Getwide(PyObject *v, wide *rv)
 			rv->hi = -1;
 		return 1;
 	}
-	return PyArg_Parse(v, "(ll)", &rv->hi, &rv->lo);
+	return PyArg_Parse(v, "(KK)", &rv->hi, &rv->lo);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ PyMac_BuildPoint(Point p)`
`415`	`415`	`int`
`416`	`416`	`PyMac_GetEventRecord(PyObject v, EventRecord e)`
`417`	`417`	`{`
`418`		`- return PyArg_Parse(v, "(Hll(hh)H)",`
	`418`	`+ return PyArg_Parse(v, "(HKK(hh)H)",`
`419`	`419`	`&e->what,`
`420`	`420`	`&e->message,`
`421`	`421`	`&e->when,`
`@@ -471,7 +471,7 @@ PyMac_Getwide(PyObject v, wide rv)`
`471`	`471`	`rv->hi = -1;`
`472`	`472`	`return 1;`
`473`	`473`	`}`
`474`		`- return PyArg_Parse(v, "(ll)", &rv->hi, &rv->lo);`
	`474`	`+ return PyArg_Parse(v, "(KK)", &rv->hi, &rv->lo);`
`475`	`475`	`}`
`476`	`476`
`477`	`477`