[Python-checkins] r45223 - in python/trunk: Modules/_ctypes/_ctypes.c Modules/_testcapimodule.c Modules/cPickle.c Python/compile.c
neal.norwitz
python-checkins at python.org
Mon Apr 10 03:03:36 CEST 2006
Author: neal.norwitz
Date: Mon Apr 10 03:03:32 2006
New Revision: 45223
Modified:
python/trunk/Modules/_ctypes/_ctypes.c
python/trunk/Modules/_testcapimodule.c
python/trunk/Modules/cPickle.c
python/trunk/Python/compile.c
Log:
Fix some warnings on HP-UX when using cc/aCC
Modified: python/trunk/Modules/_ctypes/_ctypes.c
==============================================================================
--- python/trunk/Modules/_ctypes/_ctypes.c (original)
+++ python/trunk/Modules/_ctypes/_ctypes.c Mon Apr 10 03:03:32 2006
@@ -904,7 +904,7 @@
PyObject *typedict;
int length;
- int itemsize, itemalign, itemlen;
+ int itemsize, itemalign;
typedict = PyTuple_GetItem(args, 2);
if (!typedict)
@@ -941,7 +941,6 @@
itemsize = itemdict->size;
itemalign = itemdict->align;
- itemlen = itemdict->length;
stgdict->size = itemsize * length;
stgdict->align = itemalign;
Modified: python/trunk/Modules/_testcapimodule.c
==============================================================================
--- python/trunk/Modules/_testcapimodule.c (original)
+++ python/trunk/Modules/_testcapimodule.c Mon Apr 10 03:03:32 2006
@@ -404,7 +404,7 @@
PyTuple_SET_ITEM(tuple, 0, num);
- value = -1;
+ value = 0;
if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
return NULL;
if (value != ULONG_MAX)
@@ -423,7 +423,7 @@
PyTuple_SET_ITEM(tuple, 0, num);
- value = -1;
+ value = 0;
if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
return NULL;
if (value != (unsigned long)-0x42)
Modified: python/trunk/Modules/cPickle.c
==============================================================================
--- python/trunk/Modules/cPickle.c (original)
+++ python/trunk/Modules/cPickle.c Mon Apr 10 03:03:32 2006
@@ -123,7 +123,7 @@
*__getstate___str, *__setstate___str, *__name___str, *__reduce___str,
*__reduce_ex___str,
*write_str, *append_str,
- *read_str, *readline_str, *__main___str, *__basicnew___str,
+ *read_str, *readline_str, *__main___str,
*copy_reg_str, *dispatch_table_str;
/*************************************************************************
@@ -5602,7 +5602,6 @@
INIT_STR(readline);
INIT_STR(copy_reg);
INIT_STR(dispatch_table);
- INIT_STR(__basicnew__);
if (!( copy_reg = PyImport_ImportModule("copy_reg")))
return -1;
Modified: python/trunk/Python/compile.c
==============================================================================
--- python/trunk/Python/compile.c (original)
+++ python/trunk/Python/compile.c Mon Apr 10 03:03:32 2006
@@ -4089,7 +4089,7 @@
{
int d_bytecode, d_lineno;
int len;
- char *lnotab;
+ unsigned char *lnotab;
d_bytecode = a->a_offset - a->a_lineno_off;
d_lineno = i->i_lineno - a->a_lineno;
@@ -4112,7 +4112,8 @@
if (_PyString_Resize(&a->a_lnotab, len) < 0)
return 0;
}
- lnotab = PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
+ lnotab = (unsigned char *)
+ PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
for (j = 0; j < ncodes; j++) {
*lnotab++ = 255;
*lnotab++ = 0;
@@ -4133,7 +4134,8 @@
if (_PyString_Resize(&a->a_lnotab, len) < 0)
return 0;
}
- lnotab = PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
+ lnotab = (unsigned char *)
+ PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
*lnotab++ = 255;
*lnotab++ = d_bytecode;
d_bytecode = 0;
@@ -4150,7 +4152,8 @@
if (_PyString_Resize(&a->a_lnotab, len * 2) < 0)
return 0;
}
- lnotab = PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
+ lnotab = (unsigned char *)
+ PyString_AS_STRING(a->a_lnotab) + a->a_lnotab_off;
a->a_lnotab_off += 2;
if (d_bytecode) {
More information about the Python-checkins
mailing list