Fix some warnings on HP-UX when using cc/aCC

This commit is contained in:
Neal Norwitz 2006-04-10 01:03:32 +00:00
parent 6974a51d1a
commit b183a25c29
4 changed files with 11 additions and 10 deletions

View File

@ -904,7 +904,7 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
PyObject *typedict; PyObject *typedict;
int length; int length;
int itemsize, itemalign, itemlen; int itemsize, itemalign;
typedict = PyTuple_GetItem(args, 2); typedict = PyTuple_GetItem(args, 2);
if (!typedict) if (!typedict)
@ -941,7 +941,6 @@ ArrayType_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
itemsize = itemdict->size; itemsize = itemdict->size;
itemalign = itemdict->align; itemalign = itemdict->align;
itemlen = itemdict->length;
stgdict->size = itemsize * length; stgdict->size = itemsize * length;
stgdict->align = itemalign; stgdict->align = itemalign;

View File

@ -404,7 +404,7 @@ test_k_code(PyObject *self)
PyTuple_SET_ITEM(tuple, 0, num); PyTuple_SET_ITEM(tuple, 0, num);
value = -1; value = 0;
if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0) if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
return NULL; return NULL;
if (value != ULONG_MAX) if (value != ULONG_MAX)
@ -423,7 +423,7 @@ test_k_code(PyObject *self)
PyTuple_SET_ITEM(tuple, 0, num); PyTuple_SET_ITEM(tuple, 0, num);
value = -1; value = 0;
if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0) if (PyArg_ParseTuple(tuple, "k:test_k_code", &value) < 0)
return NULL; return NULL;
if (value != (unsigned long)-0x42) if (value != (unsigned long)-0x42)

View File

@ -123,7 +123,7 @@ static PyObject *__class___str, *__getinitargs___str, *__dict___str,
*__getstate___str, *__setstate___str, *__name___str, *__reduce___str, *__getstate___str, *__setstate___str, *__name___str, *__reduce___str,
*__reduce_ex___str, *__reduce_ex___str,
*write_str, *append_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; *copy_reg_str, *dispatch_table_str;
/************************************************************************* /*************************************************************************
@ -5602,7 +5602,6 @@ init_stuff(PyObject *module_dict)
INIT_STR(readline); INIT_STR(readline);
INIT_STR(copy_reg); INIT_STR(copy_reg);
INIT_STR(dispatch_table); INIT_STR(dispatch_table);
INIT_STR(__basicnew__);
if (!( copy_reg = PyImport_ImportModule("copy_reg"))) if (!( copy_reg = PyImport_ImportModule("copy_reg")))
return -1; return -1;

View File

@ -4089,7 +4089,7 @@ assemble_lnotab(struct assembler *a, struct instr *i)
{ {
int d_bytecode, d_lineno; int d_bytecode, d_lineno;
int len; int len;
char *lnotab; unsigned char *lnotab;
d_bytecode = a->a_offset - a->a_lineno_off; d_bytecode = a->a_offset - a->a_lineno_off;
d_lineno = i->i_lineno - a->a_lineno; d_lineno = i->i_lineno - a->a_lineno;
@ -4112,7 +4112,8 @@ assemble_lnotab(struct assembler *a, struct instr *i)
if (_PyString_Resize(&a->a_lnotab, len) < 0) if (_PyString_Resize(&a->a_lnotab, len) < 0)
return 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++) { for (j = 0; j < ncodes; j++) {
*lnotab++ = 255; *lnotab++ = 255;
*lnotab++ = 0; *lnotab++ = 0;
@ -4133,7 +4134,8 @@ assemble_lnotab(struct assembler *a, struct instr *i)
if (_PyString_Resize(&a->a_lnotab, len) < 0) if (_PyString_Resize(&a->a_lnotab, len) < 0)
return 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++ = 255;
*lnotab++ = d_bytecode; *lnotab++ = d_bytecode;
d_bytecode = 0; d_bytecode = 0;
@ -4150,7 +4152,8 @@ assemble_lnotab(struct assembler *a, struct instr *i)
if (_PyString_Resize(&a->a_lnotab, len * 2) < 0) if (_PyString_Resize(&a->a_lnotab, len * 2) < 0)
return 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; a->a_lnotab_off += 2;
if (d_bytecode) { if (d_bytecode) {