Converted manually written code to the new K format specifier.

Untested, but at least it still compiles.

diff --git a/Mac/Modules/Nav.c b/Mac/Modules/Nav.c
index 9fbd2b0994fb6c72835b6ae5f4304049775dcdc4..81d00b2bbd5d2d97bbf185ed2070fdc9877711ff 100644 (file)
--- 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
index 58e565f8d80e6b3536100011d80ca3616214609b..288c65afa9c7bc44b09865b6d790af8ded2a1363 100644 (file)
--- 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
index 25b6514a9cf1b673378c22e6862f5a43f3ae738f..2b32008113b5ee6779aafdd361e6539bfa660664 100644 (file)
--- 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);
 }