diff options
| author | Guido van Rossum <guido@python.org> | 1995-01-18 23:57:26 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1995-01-18 23:57:26 (GMT) |
| commit | 8f69179f973b1eb4c29914d73a275a2488132a08 (patch) | |
| tree | 7c2e6868abaac2ff8e516ebc58446f0102389224 /Mac/Python/macglue.c | |
| parent | 8d6c180c8d32d5c3126a1d9a30512cdb69343c64 (diff) | |
| download | cpython-8f69179f973b1eb4c29914d73a275a2488132a08.zip cpython-8f69179f973b1eb4c29914d73a275a2488132a08.tar.gz cpython-8f69179f973b1eb4c29914d73a275a2488132a08.tar.bz2 | |
modernized/rationalized, added PyMac_BuildOSType
Diffstat (limited to 'Mac/Python/macglue.c')
| -rw-r--r-- | Mac/Python/macglue.c | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/Mac/Python/macglue.c b/Mac/Python/macglue.c index 76e96a8..741e985 100644 --- a/Mac/Python/macglue.c +++ b/Mac/Python/macglue.c @@ -63,10 +63,12 @@ PyErr_Mac(PyObject *eobj, int err) char *msg; PyObject *v; - if (err == 0) { + if (err == 0 && !PyErr_Occurred()) { Py_INCREF(Py_None); return Py_None; } + if (err == -1 && PyErr_Occurred()) + return NULL; msg = macstrerror(err); v = Py_BuildValue("(is)", err, msg); PyErr_SetObject(eobj, v); @@ -102,7 +104,7 @@ PyMac_Idle() /* Convert a ResType argument */ int -GetOSType(PyObject *v, ResType *pr) +PyMac_GetOSType(PyObject *v, ResType *pr) { if (!PyString_Check(v) || PyString_Size(v) != 4) { PyErr_SetString(PyExc_TypeError, @@ -115,7 +117,7 @@ GetOSType(PyObject *v, ResType *pr) /* Convert a Str255 argument */ int -GetStr255(PyObject *v, Str255 pbuf) +PyMac_GetStr255(PyObject *v, Str255 pbuf) { int len; if (!PyString_Check(v) || (len = PyString_Size(v)) > 255) { @@ -136,7 +138,7 @@ GetStr255(PyObject *v, Str255 pbuf) ** this is probably sys7 dependent anyway). */ int -GetFSSpec(PyObject *v, FSSpec *fs) +PyMac_GetFSSpec(PyObject *v, FSSpec *fs) { Str255 path; short refnum; @@ -172,3 +174,10 @@ PyMac_BuildFSSpec(FSSpec *fs) { return Py_BuildValue("(iis#)", fs->vRefNum, fs->parID, &fs->name[1], fs->name[0]); } + +/* Convert an OSType value to a 4-char string object */ +PyObject * +PyMac_BuildOSType(OSType t) +{ + return PyString_FromStringAndSize((char *)&t, 4); +} |