[Python-checkins] python/dist/src/Modules bz2module.c,1.4,1.5
tim_one@users.sourceforge.net
tim_one@users.sourceforge.net
Fri, 08 Nov 2002 20:21:46 -0800
- Previous message: [Python-checkins] python/nondist/peps/docutils/writers .cvsignore,NONE,1.1 __init__.py,NONE,1.1 docutils_xml.py,NONE,1.1 html4css1.py,NONE,1.1 pep_html.py,NONE,1.1 pseudoxml.py,NONE,1.1
- Next message: [Python-checkins] python/dist/src/Modules bz2module.c,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/python/python/dist/src/Modules
In directory usw-pr-cvs1:/tmp/cvs-serv9970/modules
Modified Files:
bz2module.c
Log Message:
This couldn't compile on WIndows, due to hardcoded "long long". Repaired.
Index: bz2module.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/bz2module.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** bz2module.c 8 Nov 2002 14:31:49 -0000 1.4
--- bz2module.c 9 Nov 2002 04:21:44 -0000 1.5
***************
*** 37,41 ****
#elif SIZEOF_LONG_LONG >= 8
#define BZS_TOTAL_OUT(bzs) \
! (((long long)bzs->total_out_hi32 << 32) + bzs->total_out_lo32)
#else
#define BZS_TOTAL_OUT(bzs) \
--- 37,41 ----
#elif SIZEOF_LONG_LONG >= 8
#define BZS_TOTAL_OUT(bzs) \
! (((LONG_LONG)bzs->total_out_hi32 << 32) + bzs->total_out_lo32)
#else
#define BZS_TOTAL_OUT(bzs) \
***************
*** 110,114 ****
ret = 1;
break;
!
case BZ_PARAM_ERROR:
PyErr_SetString(PyExc_ValueError,
--- 110,114 ----
ret = 1;
break;
!
case BZ_PARAM_ERROR:
PyErr_SetString(PyExc_ValueError,
***************
*** 117,121 ****
ret = 1;
break;
!
case BZ_MEM_ERROR:
PyErr_NoMemory();
--- 117,121 ----
ret = 1;
break;
!
case BZ_MEM_ERROR:
PyErr_NoMemory();
***************
*** 215,220 ****
skipnextlf = 0;
if (c == '\n') {
! /* Seeing a \n here with
! * skipnextlf true means we
* saw a \r before.
*/
--- 215,220 ----
skipnextlf = 0;
if (c == '\n') {
! /* Seeing a \n here with
! * skipnextlf true means we
* saw a \r before.
*/
***************
*** 378,382 ****
if (f->f_buf != NULL) {
! if((f->f_bufend - f->f_bufptr) >= 1)
return 0;
else
--- 378,382 ----
if (f->f_buf != NULL) {
! if((f->f_bufend - f->f_bufptr) >= 1)
return 0;
else
***************
*** 419,427 ****
if (f->f_buf == NULL)
! if (Util_ReadAhead(bf, bufsize) < 0)
return NULL;
len = f->f_bufend - f->f_bufptr;
! if (len == 0)
return (PyStringObject *)
PyString_FromStringAndSize(NULL, skip);
--- 419,427 ----
if (f->f_buf == NULL)
! if (Util_ReadAhead(bf, bufsize) < 0)
return NULL;
len = f->f_bufend - f->f_bufptr;
! if (len == 0)
return (PyStringObject *)
PyString_FromStringAndSize(NULL, skip);
***************
*** 432,436 ****
s = (PyStringObject *)
PyString_FromStringAndSize(NULL, skip+len);
! if (s == NULL)
return NULL;
memcpy(PyString_AS_STRING(s)+skip, f->f_bufptr, len);
--- 432,436 ----
s = (PyStringObject *)
PyString_FromStringAndSize(NULL, skip+len);
! if (s == NULL)
return NULL;
memcpy(PyString_AS_STRING(s)+skip, f->f_bufptr, len);
***************
*** 472,479 ****
int bzerror;
PyObject *ret = NULL;
!
if (!PyArg_ParseTuple(args, "|l:read", &bytesrequested))
return NULL;
!
ACQUIRE_LOCK(self);
switch (self->mode) {
--- 472,479 ----
int bzerror;
PyObject *ret = NULL;
!
if (!PyArg_ParseTuple(args, "|l:read", &bytesrequested))
return NULL;
!
ACQUIRE_LOCK(self);
switch (self->mode) {
***************
*** 762,776 ****
if (!PyArg_ParseTuple(args, "s#", &buf, &len))
return NULL;
!
ACQUIRE_LOCK(self);
switch (self->mode) {
case MODE_WRITE:
break;
!
case MODE_CLOSED:
PyErr_SetString(PyExc_ValueError,
"I/O operation on closed file");
goto cleanup;;
!
default:
PyErr_SetString(PyExc_IOError,
--- 762,776 ----
if (!PyArg_ParseTuple(args, "s#", &buf, &len))
return NULL;
!
ACQUIRE_LOCK(self);
switch (self->mode) {
case MODE_WRITE:
break;
!
case MODE_CLOSED:
PyErr_SetString(PyExc_ValueError,
"I/O operation on closed file");
goto cleanup;;
!
default:
PyErr_SetString(PyExc_IOError,
***************
*** 785,794 ****
self->pos += len;
Py_END_ALLOW_THREADS
!
if (bzerror != BZ_OK) {
Util_CatchBZ2Error(bzerror);
goto cleanup;
}
!
Py_INCREF(Py_None);
ret = Py_None;
--- 785,794 ----
self->pos += len;
Py_END_ALLOW_THREADS
!
if (bzerror != BZ_OK) {
Util_CatchBZ2Error(bzerror);
goto cleanup;
}
!
Py_INCREF(Py_None);
ret = Py_None;
***************
*** 946,950 ****
PyObject *func;
PyObject *ret = NULL;
!
if (!PyArg_ParseTuple(args, "l|i:seek", &offset, &where))
return NULL;
--- 946,950 ----
PyObject *func;
PyObject *ret = NULL;
!
if (!PyArg_ParseTuple(args, "l|i:seek", &offset, &where))
return NULL;
***************
*** 956,965 ****
case MODE_READ_EOF:
break;
!
case MODE_CLOSED:
PyErr_SetString(PyExc_ValueError,
"I/O operation on closed file");
goto cleanup;;
!
default:
PyErr_SetString(PyExc_IOError,
--- 956,965 ----
case MODE_READ_EOF:
break;
!
case MODE_CLOSED:
PyErr_SetString(PyExc_ValueError,
"I/O operation on closed file");
goto cleanup;;
!
default:
PyErr_SetString(PyExc_IOError,
***************
*** 1193,1197 ****
self->size = -1;
!
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "et|sii:BZ2File",
kwlist, Py_FileSystemDefaultEncoding,
--- 1193,1197 ----
self->size = -1;
!
if (!PyArg_ParseTupleAndKeywords(args, kwargs, "et|sii:BZ2File",
kwlist, Py_FileSystemDefaultEncoding,
***************
*** 1241,1245 ****
else
mode = univ_newline ? "wbU" : "wb";
!
file_args = Py_BuildValue("(ssi)", name, mode, buffering);
if (!file_args)
--- 1241,1245 ----
else
mode = univ_newline ? "wbU" : "wb";
!
file_args = Py_BuildValue("(ssi)", name, mode, buffering);
if (!file_args)
***************
*** 1953,1957 ****
return NULL;
}
!
for (;;) {
Py_BEGIN_ALLOW_THREADS
--- 1953,1957 ----
return NULL;
}
!
for (;;) {
Py_BEGIN_ALLOW_THREADS
***************
*** 2026,2030 ****
return NULL;
}
!
for (;;) {
Py_BEGIN_ALLOW_THREADS
--- 2026,2030 ----
return NULL;
}
!
for (;;) {
Py_BEGIN_ALLOW_THREADS
- Previous message: [Python-checkins] python/nondist/peps/docutils/writers .cvsignore,NONE,1.1 __init__.py,NONE,1.1 docutils_xml.py,NONE,1.1 html4css1.py,NONE,1.1 pep_html.py,NONE,1.1 pseudoxml.py,NONE,1.1
- Next message: [Python-checkins] python/dist/src/Modules bz2module.c,1.5,1.6
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]