Magellan Linux

Contents of /trunk/pyvorbis/patches/pyvorbis-1.4-python25.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 363 - (show annotations) (download)
Tue Sep 25 20:48:16 2007 UTC (16 years, 8 months ago) by niro
File size: 1562 byte(s)
-python25 fixup

1 diff -ur pyvorbis-1.4-old/src/pyvorbiscodec.c pyvorbis-1.4/src/pyvorbiscodec.c
2 --- pyvorbis-1.4-old/src/pyvorbiscodec.c 2003-05-13 11:17:13.000000000 +0300
3 +++ pyvorbis-1.4/src/pyvorbiscodec.c 2007-09-20 01:57:54.000000000 +0300
4 @@ -118,7 +118,7 @@
5 {
6 vorbis_dsp_clear(PY_DSP(self));
7 Py_XDECREF(((py_dsp *)self)->parent);
8 - PyMem_DEL(self);
9 + PyObject_Del(self);
10 }
11
12 static PyObject*
13 @@ -447,7 +447,7 @@
14 {
15 vorbis_block_clear(PY_BLOCK(self));
16 Py_XDECREF(((py_block *)self)->parent);
17 - PyMem_DEL(self);
18 + PyObject_Del(self);
19 }
20
21 static PyObject*
22 diff -ur pyvorbis-1.4-old/src/pyvorbisfile.c pyvorbis-1.4/src/pyvorbisfile.c
23 --- pyvorbis-1.4-old/src/pyvorbisfile.c 2003-12-19 09:11:02.000000000 +0200
24 +++ pyvorbis-1.4/src/pyvorbisfile.c 2007-09-20 01:59:41.000000000 +0300
25 @@ -173,8 +173,7 @@
26 if (ret == NULL) {
27 PyMem_DEL(newobj);
28 return NULL;
29 - } else
30 - Py_DECREF(ret);
31 + }
32
33 return (PyObject *) newobj;
34 }
35 @@ -195,7 +194,8 @@
36 fclose(py_self->c_file);
37 }
38
39 - PyMem_DEL(self);
40 + free(py_self->ovf);
41 + PyObject_Del(self);
42 }
43
44 static PyObject *
45 diff -ur pyvorbis-1.4-old/src/pyvorbisinfo.c pyvorbis-1.4/src/pyvorbisinfo.c
46 --- pyvorbis-1.4-old/src/pyvorbisinfo.c 2003-12-19 09:51:36.000000000 +0200
47 +++ pyvorbis-1.4/src/pyvorbisinfo.c 2007-09-20 02:01:58.000000000 +0300
48 @@ -134,7 +134,7 @@
49 static void
50 py_ov_info_dealloc(PyObject *self)
51 {
52 - PyMem_DEL(self);
53 + PyObject_Del(self);
54 }
55
56 #define CMP_RET(x) \
57 @@ -418,7 +418,7 @@
58 free(ovc_self->vc);
59 }
60
61 - PyMem_DEL(self);
62 + PyObject_Del(self);
63 }
64
65