SF but #417587: compiler warnings compiling 2.1.
Repaired *some* of the SGI compiler warnings Sjoerd Mullender reported.
diff --git a/Modules/mmapmodule.c b/Modules/mmapmodule.c
index c1cc013..c48278f 100644
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -818,7 +818,7 @@
m_obj->data = mmap(NULL, map_size,
prot, flags,
fd, 0);
- if (m_obj->data == (void *)-1)
+ if (m_obj->data == (char *)-1)
{
Py_DECREF(m_obj);
PyErr_SetFromErrno(mmap_module_error);
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index f3cab05..b3c8ba4 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -671,12 +671,10 @@
case 0:
errmsg = "unexpected code byte";
goto utf8Error;
- break;
case 1:
errmsg = "internal error";
goto utf8Error;
- break;
case 2:
if ((s[1] & 0xc0) != 0x80) {
@@ -740,7 +738,6 @@
/* Other sizes are only needed for UCS-4 */
errmsg = "unsupported Unicode code range";
goto utf8Error;
- break;
}
s += n;
continue;
diff --git a/Parser/tokenizer.c b/Parser/tokenizer.c
index 6ae5084..b783e80 100644
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -445,7 +445,6 @@
switch (c3) {
case '=':
return LEFTSHIFTEQUAL;
- break;
}
break;
}
@@ -456,7 +455,6 @@
switch (c3) {
case '=':
return RIGHTSHIFTEQUAL;
- break;
}
break;
}
@@ -467,7 +465,6 @@
switch (c3) {
case '=':
return DOUBLESTAREQUAL;
- break;
}
break;
}
diff --git a/Python/ceval.c b/Python/ceval.c
index 4f4a646..d76c6f2 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2146,7 +2146,6 @@
opcode = NEXTOP();
oparg = oparg<<16 | NEXTARG();
goto dispatch_opcode;
- break;
default:
fprintf(stderr,