Changeset 388 for python/vendor/current/Python/mactoolboxglue.c

Timestamp:

Mar 19, 2014, 11:11:30 AM (11 years ago)

Author:

dmik

Message:

python: Update vendor to 2.7.6.

File:

• python/vendor/current/Python/mactoolboxglue.c (modified) (24 diffs)

python/vendor/current/Python/mactoolboxglue.c

@@ -5 +5 @@
                         All Rights Reserved
 
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
+Permission to use, copy, modify, and distribute this software and its
+documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
+both that copyright notice and this permission notice appear in
 supporting documentation, and that the names of Stichting Mathematisch
 Centrum or CWI not be used in advertising or publicity pertaining to
@@ -26 +26 @@
 #include "Python.h"
 #include "pymactoolbox.h"
-#include <arpa/inet.h>  /* for ntohl, htonl */
+#include <arpa/inet.h>  /* for ntohl, htonl */
 
 
@@ -33 +33 @@
 PyMac_StrError(int err)
 {
-        static char buf[256];
-        PyObject *m;
-        PyObject *rv;
-
-        m = PyImport_ImportModuleNoBlock("MacOS");
-        if (!m) {
-                if (Py_VerboseFlag)
-                        PyErr_Print();
-                PyErr_Clear();
-                rv = NULL;
-        }
-        else {
-                rv = PyObject_CallMethod(m, "GetErrorString", "i", err);
-                if (!rv)
-                        PyErr_Clear();
-        }
-        if (!rv) {
-                buf[0] = '\0';
-        }
-        else {
-                char *input = PyString_AsString(rv);
-                if (!input) {
-                        PyErr_Clear();
-                        buf[0] = '\0';
-                } else {
-                        strncpy(buf, input, sizeof(buf) - 1);
-                        buf[sizeof(buf) - 1] = '\0';
-                }
-                Py_DECREF(rv);
-        }
-        Py_XDECREF(m);
-        return buf;
+    static char buf[256];
+    PyObject *m;
+    PyObject *rv;
+
+    m = PyImport_ImportModuleNoBlock("MacOS");
+    if (!m) {
+        if (Py_VerboseFlag)
+            PyErr_Print();
+        PyErr_Clear();
+        rv = NULL;
+    }
+    else {
+        rv = PyObject_CallMethod(m, "GetErrorString", "i", err);
+        if (!rv)
+            PyErr_Clear();
+    }
+    if (!rv) {
+        buf[0] = '\0';
+    }
+    else {
+        char *input = PyString_AsString(rv);
+        if (!input) {
+            PyErr_Clear();
+            buf[0] = '\0';
+        } else {
+            strncpy(buf, input, sizeof(buf) - 1);
+            buf[sizeof(buf) - 1] = '\0';
+        }
+        Py_DECREF(rv);
+    }
+    Py_XDECREF(m);
+    return buf;
 }
 
@@ -74 +74 @@
 PyMac_GetOSErrException(void)
 {
-        if (PyMac_OSErrException == NULL)
-                PyMac_OSErrException = PyErr_NewException("MacOS.Error", NULL, NULL);
-        return PyMac_OSErrException;
+    if (PyMac_OSErrException == NULL)
+        PyMac_OSErrException = PyErr_NewException("MacOS.Error", NULL, NULL);
+    return PyMac_OSErrException;
 }
 
 /* Set a MAC-specific error from errno, and return NULL; return None if no error */
-PyObject * 
+PyObject *
 PyErr_Mac(PyObject *eobj, int err)
 {
-        char *msg;
-        PyObject *v;
-        
-        if (err == 0 && !PyErr_Occurred()) {
-                Py_INCREF(Py_None);
-                return Py_None;
-        }
-        if (err == -1 && PyErr_Occurred())
-                return NULL;
-        msg = PyMac_StrError(err);
-        v = Py_BuildValue("(is)", err, msg);
-        PyErr_SetObject(eobj, v);
-        Py_DECREF(v);
-        return NULL;
+    char *msg;
+    PyObject *v;
+
+    if (err == 0 && !PyErr_Occurred()) {
+        Py_INCREF(Py_None);
+        return Py_None;
+    }
+    if (err == -1 && PyErr_Occurred())
+        return NULL;
+    msg = PyMac_StrError(err);
+    v = Py_BuildValue("(is)", err, msg);
+    PyErr_SetObject(eobj, v);
+    Py_DECREF(v);
+    return NULL;
 }
 
@@ -103 +103 @@
 PyMac_Error(OSErr err)
 {
-        return PyErr_Mac(PyMac_GetOSErrException(), err);
+    return PyErr_Mac(PyMac_GetOSErrException(), err);
 }
 
@@ -111 +111 @@
 PyMac_GetFullPathname(FSSpec *fss, char *path, int len)
 {
-        PyObject *fs, *exc;
-        PyObject *rv = NULL;
-        char *input;
-        OSErr err = noErr;
-
-        *path = '\0';
-
-        fs = PyMac_BuildFSSpec(fss);
-        if (!fs)
-                goto error;
-
-        rv = PyObject_CallMethod(fs, "as_pathname", "");
-        if (!rv)
-                goto error;
-
-        input = PyString_AsString(rv);
-        if (!input)
-                goto error;
-
-        strncpy(path, input, len - 1);
-        path[len - 1] = '\0';
-
-        Py_XDECREF(rv);
-        Py_XDECREF(fs);
-        return err;
+    PyObject *fs, *exc;
+    PyObject *rv = NULL;
+    char *input;
+    OSErr err = noErr;
+
+    *path = '\0';
+
+    fs = PyMac_BuildFSSpec(fss);
+    if (!fs)
+        goto error;
+
+    rv = PyObject_CallMethod(fs, "as_pathname", "");
+    if (!rv)
+        goto error;
+
+    input = PyString_AsString(rv);
+    if (!input)
+        goto error;
+
+    strncpy(path, input, len - 1);
+    path[len - 1] = '\0';
+
+    Py_XDECREF(rv);
+    Py_XDECREF(fs);
+    return err;
 
   error:
-        exc = PyErr_Occurred();
-        if (exc  && PyErr_GivenExceptionMatches(exc,
-                                                PyMac_GetOSErrException())) {
-                PyObject *args = PyObject_GetAttrString(exc, "args");
-                if (args) {
-                        char *ignore;
-                        PyArg_ParseTuple(args, "is", &err, &ignore);
-                        Py_XDECREF(args);
-                }
-        }
-        if (err == noErr)
-                err = -1;
-        PyErr_Clear();
-        Py_XDECREF(rv);
-        Py_XDECREF(fs);
-        return err;
+    exc = PyErr_Occurred();
+    if (exc  && PyErr_GivenExceptionMatches(exc,
+                                            PyMac_GetOSErrException())) {
+        PyObject *args = PyObject_GetAttrString(exc, "args");
+        if (args) {
+            char *ignore;
+            PyArg_ParseTuple(args, "is", &err, &ignore);
+            Py_XDECREF(args);
+        }
+    }
+    if (err == noErr)
+        err = -1;
+    PyErr_Clear();
+    Py_XDECREF(rv);
+    Py_XDECREF(fs);
+    return err;
 }
 #endif /* !__LP64__ */
@@ -161 +161 @@
 PyMac_GetOSType(PyObject *v, OSType *pr)
 {
-        uint32_t tmp;
-        if (!PyString_Check(v) || PyString_Size(v) != 4) {
-                PyErr_SetString(PyExc_TypeError,
-                        "OSType arg must be string of 4 chars");
-                return 0;
-        }
-        memcpy((char *)&tmp, PyString_AsString(v), 4);
-        *pr = (OSType)ntohl(tmp);
-        return 1;
+    uint32_t tmp;
+    if (!PyString_Check(v) || PyString_Size(v) != 4) {
+        PyErr_SetString(PyExc_TypeError,
+            "OSType arg must be string of 4 chars");
+        return 0;
+    }
+    memcpy((char *)&tmp, PyString_AsString(v), 4);
+    *pr = (OSType)ntohl(tmp);
+    return 1;
 }
 
@@ -176 +176 @@
 PyMac_BuildOSType(OSType t)
 {
-        uint32_t tmp = htonl((uint32_t)t);
-        return PyString_FromStringAndSize((char *)&tmp, 4);
+    uint32_t tmp = htonl((uint32_t)t);
+    return PyString_FromStringAndSize((char *)&tmp, 4);
 }
 
@@ -184 +184 @@
 PyMac_BuildNumVersion(NumVersion t)
 {
-        return Py_BuildValue("(hhhh)", t.majorRev, t.minorAndBugRev, t.stage, t.nonRelRev);
+    return Py_BuildValue("(hhhh)", t.majorRev, t.minorAndBugRev, t.stage, t.nonRelRev);
 }
 
@@ -192 +192 @@
 PyMac_GetStr255(PyObject *v, Str255 pbuf)
 {
-        int len;
-        if (!PyString_Check(v) || (len = PyString_Size(v)) > 255) {
-                PyErr_SetString(PyExc_TypeError,
-                        "Str255 arg must be string of at most 255 chars");
-                return 0;
-        }
-        pbuf[0] = len;
-        memcpy((char *)(pbuf+1), PyString_AsString(v), len);
-        return 1;
+    int len;
+    if (!PyString_Check(v) || (len = PyString_Size(v)) > 255) {
+        PyErr_SetString(PyExc_TypeError,
+            "Str255 arg must be string of at most 255 chars");
+        return 0;
+    }
+    pbuf[0] = len;
+    memcpy((char *)(pbuf+1), PyString_AsString(v), len);
+    return 1;
 }
 
@@ -207 +207 @@
 PyMac_BuildStr255(Str255 s)
 {
-        if ( s == NULL ) {
-                PyErr_SetString(PyExc_SystemError, "Str255 pointer is NULL");
-                return NULL;
-        }
-        return PyString_FromStringAndSize((char *)&s[1], (int)s[0]);
+    if ( s == NULL ) {
+        PyErr_SetString(PyExc_SystemError, "Str255 pointer is NULL");
+        return NULL;
+    }
+    return PyString_FromStringAndSize((char *)&s[1], (int)s[0]);
 }
 
@@ -217 +217 @@
 PyMac_BuildOptStr255(Str255 s)
 {
-        if ( s == NULL ) {
-                Py_INCREF(Py_None);
-                return Py_None;
-        }
-        return PyString_FromStringAndSize((char *)&s[1], (int)s[0]);
+    if ( s == NULL ) {
+        Py_INCREF(Py_None);
+        return Py_None;
+    }
+    return PyString_FromStringAndSize((char *)&s[1], (int)s[0]);
 }
 
@@ -233 +233 @@
 PyMac_GetRect(PyObject *v, Rect *r)
 {
-        return PyArg_Parse(v, "(hhhh)", &r->left, &r->top, &r->right, &r->bottom);
+    return PyArg_Parse(v, "(hhhh)", &r->left, &r->top, &r->right, &r->bottom);
 }
 
@@ -240 +240 @@
 PyMac_BuildRect(Rect *r)
 {
-        return Py_BuildValue("(hhhh)", r->left, r->top, r->right, r->bottom);
+    return Py_BuildValue("(hhhh)", r->left, r->top, r->right, r->bottom);
 }
 
@@ -251 +251 @@
 PyMac_GetPoint(PyObject *v, Point *p)
 {
-        return PyArg_Parse(v, "(hh)", &p->h, &p->v);
+    return PyArg_Parse(v, "(hh)", &p->h, &p->v);
 }
 
@@ -258 +258 @@
 PyMac_BuildPoint(Point p)
 {
-        return Py_BuildValue("(hh)", p.h, p.v);
+    return Py_BuildValue("(hh)", p.h, p.v);
 }
 
@@ -267 +267 @@
 PyMac_GetEventRecord(PyObject *v, EventRecord *e)
 {
-        return PyArg_Parse(v, "(Hkk(hh)H)",
-                           &e->what,
-                           &e->message,
-                           &e->when,
-                           &e->where.h,
-                           &e->where.v,                   
-                           &e->modifiers);
+    return PyArg_Parse(v, "(Hkk(hh)H)",
+                       &e->what,
+                       &e->message,
+                       &e->when,
+                       &e->where.h,
+                       &e->where.v,
+                       &e->modifiers);
 }
 
@@ -280 +280 @@
 PyMac_BuildEventRecord(EventRecord *e)
 {
-        return Py_BuildValue("(hll(hh)h)",
-                             e->what,
-                             e->message,
-                             e->when,
-                             e->where.h,
-                             e->where.v,
-                             e->modifiers);
+    return Py_BuildValue("(hll(hh)h)",
+                         e->what,
+                         e->message,
+                         e->when,
+                         e->where.h,
+                         e->where.v,
+                         e->modifiers);
 }
 
@@ -293 +293 @@
 PyMac_GetFixed(PyObject *v, Fixed *f)
 {
-        double d;
-        
-        if( !PyArg_Parse(v, "d", &d))
-                return 0;
-        *f = (Fixed)(d * 0x10000);
-        return 1;
+    double d;
+
+    if( !PyArg_Parse(v, "d", &d))
+        return 0;
+    *f = (Fixed)(d * 0x10000);
+    return 1;
 }
 
@@ -305 +305 @@
 PyMac_BuildFixed(Fixed f)
 {
-        double d;
-        
-        d = f;
-        d = d / 0x10000;
-        return Py_BuildValue("d", d);
+    double d;
+
+    d = f;
+    d = d / 0x10000;
+    return Py_BuildValue("d", d);
 }
 
@@ -316 +316 @@
 PyMac_Getwide(PyObject *v, wide *rv)
 {
-        if (PyInt_Check(v)) {
-                rv->hi = 0;
-                rv->lo = PyInt_AsLong(v);
-                if( rv->lo & 0x80000000 )
-                        rv->hi = -1;
-                return 1;
-        }
-        return PyArg_Parse(v, "(kk)", &rv->hi, &rv->lo);
+    if (PyInt_Check(v)) {
+        rv->hi = 0;
+        rv->lo = PyInt_AsLong(v);
+        if( rv->lo & 0x80000000 )
+            rv->hi = -1;
+        return 1;
+    }
+    return PyArg_Parse(v, "(kk)", &rv->hi, &rv->lo);
 }
 
@@ -330 +330 @@
 PyMac_Buildwide(wide *w)
 {
-        if ( (w->hi == 0 && (w->lo & 0x80000000) == 0) ||
-             (w->hi == -1 && (w->lo & 0x80000000) ) )
-                return PyInt_FromLong(w->lo);
-        return Py_BuildValue("(ll)", w->hi, w->lo);
+    if ( (w->hi == 0 && (w->lo & 0x80000000) == 0) ||
+         (w->hi == -1 && (w->lo & 0x80000000) ) )
+        return PyInt_FromLong(w->lo);
+    return Py_BuildValue("(ll)", w->hi, w->lo);
 }
 
@@ -359 +359 @@
        if (!PyImport_ImportModule(module)) return NULL; \
        if (!PyMacGluePtr_##routinename) { \
-           PyErr_SetString(PyExc_ImportError, "Module did not provide routine: " module ": " #routinename); \
-           return NULL; \
+       PyErr_SetString(PyExc_ImportError, "Module did not provide routine: " module ": " #routinename); \
+       return NULL; \
        } \
     } \
@@ -373 +373 @@
        if (!PyImport_ImportModule(module)) return 0; \
        if (!PyMacGluePtr_##routinename) { \
-           PyErr_SetString(PyExc_ImportError, "Module did not provide routine: " module ": " #routinename); \
-           return 0; \
+       PyErr_SetString(PyExc_ImportError, "Module did not provide routine: " module ": " #routinename); \
+       return 0; \
        } \
     } \