mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 03:22:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

rename2 changes

Browse source
This commit is contained in:
Guido van Rossum 1995-01-12 12:37:24 +00:00
parent 9a22de101f
commit fffb8bb526
4 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Mac/Include/macglue.h
View file

@ -1,3 +1,3 @@
char *macstrerror PROTO((int)); /* strerror with mac errors */ char *macstrerror Py_PROTO((int)); /* strerror with mac errors */
object *PyErr_Mac PROTO((object *, int)); /* Exception with a mac error */ PyObject *PyErr_Mac Py_PROTO((PyObject *, int)); /* Exception with a mac error */
int PyMac_Idle PROTO((void)); /* Idle routine */ int PyMac_Idle Py_PROTO((void)); /* Idle routine */

22
Mac/Modules/macosmodule.c
View file

@ -27,8 +27,6 @@ OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
#include "Python.h" #include "Python.h"
#include "macglue.h" #include "macglue.h"
#include <stdio.h>
#include <string.h>
#include <errno.h> #include <errno.h>
#include <OSUtils.h> /* for Set(Current)A5 */ #include <OSUtils.h> /* for Set(Current)A5 */
@ -78,7 +76,7 @@ GetStr255(PyObject *v, Str255 pbuf)
/* Resource objects */ /* Resource objects */
typedef struct { typedef struct {
OB_HEAD PyObject_HEAD
Handle h; Handle h;
} RsrcObject; } RsrcObject;
@ -226,8 +224,8 @@ MacOS_GetFileType(PyObject *self, PyObject *args)
type = PyString_FromStringAndSize((char *)&info.fdType, 4); type = PyString_FromStringAndSize((char *)&info.fdType, 4);
creator = PyString_FromStringAndSize((char *)&info.fdCreator, 4); creator = PyString_FromStringAndSize((char *)&info.fdCreator, 4);
res = Py_BuildValue("OO", type, creator); res = Py_BuildValue("OO", type, creator);
DECREF(type); Py_DECREF(type);
DECREF(creator); Py_DECREF(creator);
return res; return res;
} }
@ -251,7 +249,7 @@ MacOS_SetFileType(PyObject *self, PyObject *args)
info.fdCreator = creator; info.fdCreator = creator;
if ((err = SetFInfo(name, 0, &info)) != noErr) { if ((err = SetFInfo(name, 0, &info)) != noErr) {
errno = err; errno = err;
err_errno(MacOS_Error); PyErr_SetFromErrno(MacOS_Error);
return NULL; return NULL;
} }
Py_INCREF(Py_None); Py_INCREF(Py_None);
@ -278,7 +276,7 @@ GetSndCommand(PyObject *v, SndCommand *pc)
} }
typedef struct { typedef struct {
OB_HEAD PyObject_HEAD
SndChannelPtr chan; SndChannelPtr chan;
} SndChObject; } SndChObject;
@ -304,7 +302,7 @@ SndCh_Cleanup(SndChObject *s, int quitNow)
s->chan = NULL; s->chan = NULL;
SndDisposeChannel(chan, quitNow); SndDisposeChannel(chan, quitNow);
if (userInfo != 0) if (userInfo != 0)
DEL(userInfo); PyMem_DEL(userInfo);
} }
} }
@ -436,7 +434,7 @@ MySafeCallback(arg)
Py_DECREF(args); Py_DECREF(args);
if (res == NULL) if (res == NULL)
return -1; return -1;
DECREF(res); Py_DECREF(res);
return 0; return 0;
} }
@ -472,7 +470,7 @@ MacOS_SndNewChannel(PyObject *self, PyObject *args)
if (!PyArg_ParseTuple(args, "h|lO", &synth, &init, &callback)) if (!PyArg_ParseTuple(args, "h|lO", &synth, &init, &callback))
return NULL; return NULL;
if (callback != NULL) { if (callback != NULL) {
p = NEW(cbinfo, 1); p = PyMem_NEW(cbinfo, 1);
if (p == NULL) if (p == NULL)
return PyErr_NoMemory(); return PyErr_NoMemory();
p->A5 = SetCurrentA5(); p->A5 = SetCurrentA5();
@ -483,13 +481,13 @@ MacOS_SndNewChannel(PyObject *self, PyObject *args)
err = SndNewChannel(&chan, synth, init, userroutine); err = SndNewChannel(&chan, synth, init, userroutine);
if (err) { if (err) {
if (p) if (p)
DEL(p); PyMem_DEL(p);
return PyErr_Mac(MacOS_Error, (int)err); return PyErr_Mac(MacOS_Error, (int)err);
} }
res = (PyObject *)SndCh_FromSndChannelPtr(chan); res = (PyObject *)SndCh_FromSndChannelPtr(chan);
if (res == NULL) { if (res == NULL) {
SndDisposeChannel(chan, 1); SndDisposeChannel(chan, 1);
DEL(p); PyMem_DEL(p);
} }
else { else {
chan->userInfo = (long)p; chan->userInfo = (long)p;

1
Mac/Python/macgetmtime.c
View file

@ -1,4 +1,5 @@
#include "macstat.h" #include "macstat.h"
#include "rename2.h"
/* Interfaced used by import.c */ /* Interfaced used by import.c */

2
Mac/Python/macglue.c
View file

@ -40,7 +40,7 @@ char *macstrerror(int err)
/* Set a MAC-specific error from errno, and return NULL; return None if no error */ /* Set a MAC-specific error from errno, and return NULL; return None if no error */
PyObject * PyObject *
PyErr_Mac(object *eobj, int err) PyErr_Mac(PyObject *eobj, int err)
{ {
char *msg; char *msg;
PyObject *v; PyObject *v;