comparison src/if_python3.c @ 5612:30e300c0b2c1 v7.4.153

updated for version 7.4.153 Problem: Compiler warning for pointer type. Solution: Add type cast.
author Bram Moolenaar <bram@vim.org>
date Tue, 14 Jan 2014 19:35:56 +0100
parents ec02e1474bc2
children 3ee5808a293c
comparison
equal deleted inserted replaced
5611:53bfbc9e797d 5612:30e300c0b2c1
292 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *); 292 static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *);
293 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); 293 static Py_ssize_t (*py3_PyTuple_Size)(PyObject *);
294 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); 294 static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t);
295 static int (*py3_PyMapping_Check)(PyObject *); 295 static int (*py3_PyMapping_Check)(PyObject *);
296 static PyObject* (*py3_PyMapping_Keys)(PyObject *); 296 static PyObject* (*py3_PyMapping_Keys)(PyObject *);
297 static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length, 297 static int (*py3_PySlice_GetIndicesEx)(PySliceObject *r, Py_ssize_t length,
298 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, 298 Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step,
299 Py_ssize_t *slicelen); 299 Py_ssize_t *slicelen);
300 static PyObject* (*py3_PyErr_NoMemory)(void); 300 static PyObject* (*py3_PyErr_NoMemory)(void);
301 static void (*py3_Py_Finalize)(void); 301 static void (*py3_Py_Finalize)(void);
302 static void (*py3_PyErr_SetString)(PyObject *, const char *); 302 static void (*py3_PyErr_SetString)(PyObject *, const char *);
1188 Py_ssize_t start, stop, step, slicelen; 1188 Py_ssize_t start, stop, step, slicelen;
1189 1189
1190 if (CheckBuffer((BufferObject *) self)) 1190 if (CheckBuffer((BufferObject *) self))
1191 return NULL; 1191 return NULL;
1192 1192
1193 if (PySlice_GetIndicesEx((PyObject *)idx, 1193 if (PySlice_GetIndicesEx((PySliceObject *)idx,
1194 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, 1194 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
1195 &start, &stop, 1195 &start, &stop,
1196 &step, &slicelen) < 0) 1196 &step, &slicelen) < 0)
1197 { 1197 {
1198 return NULL; 1198 return NULL;
1220 Py_ssize_t start, stop, step, slicelen; 1220 Py_ssize_t start, stop, step, slicelen;
1221 1221
1222 if (CheckBuffer((BufferObject *) self)) 1222 if (CheckBuffer((BufferObject *) self))
1223 return -1; 1223 return -1;
1224 1224
1225 if (PySlice_GetIndicesEx((PyObject *)idx, 1225 if (PySlice_GetIndicesEx((PySliceObject *)idx,
1226 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count, 1226 (Py_ssize_t)((BufferObject *)(self))->buf->b_ml.ml_line_count,
1227 &start, &stop, 1227 &start, &stop,
1228 &step, &slicelen) < 0) 1228 &step, &slicelen) < 0)
1229 { 1229 {
1230 return -1; 1230 return -1;
1304 return RangeItem((RangeObject *)(self), _idx); 1304 return RangeItem((RangeObject *)(self), _idx);
1305 } else if (PySlice_Check(idx)) 1305 } else if (PySlice_Check(idx))
1306 { 1306 {
1307 Py_ssize_t start, stop, step, slicelen; 1307 Py_ssize_t start, stop, step, slicelen;
1308 1308
1309 if (PySlice_GetIndicesEx((PyObject *)idx, 1309 if (PySlice_GetIndicesEx((PySliceObject *)idx,
1310 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, 1310 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
1311 &start, &stop, 1311 &start, &stop,
1312 &step, &slicelen) < 0) 1312 &step, &slicelen) < 0)
1313 { 1313 {
1314 return NULL; 1314 return NULL;
1331 return RangeAsItem(self, n, val); 1331 return RangeAsItem(self, n, val);
1332 } else if (PySlice_Check(idx)) 1332 } else if (PySlice_Check(idx))
1333 { 1333 {
1334 Py_ssize_t start, stop, step, slicelen; 1334 Py_ssize_t start, stop, step, slicelen;
1335 1335
1336 if (PySlice_GetIndicesEx((PyObject *)idx, 1336 if (PySlice_GetIndicesEx((PySliceObject *)idx,
1337 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1, 1337 ((RangeObject *)(self))->end-((RangeObject *)(self))->start+1,
1338 &start, &stop, 1338 &start, &stop,
1339 &step, &slicelen) < 0) 1339 &step, &slicelen) < 0)
1340 { 1340 {
1341 return -1; 1341 return -1;