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 c1cc013ed29f14ff329e2d55d17c8b951b8f49c3..c48278f6c553eb5ec3ed6f50390e129c270cda65 100644 (file)
--- a/Modules/mmapmodule.c
+++ b/Modules/mmapmodule.c
@@ -818,7 +818,7 @@ new_mmap_object(PyObject *self, PyObject *args, PyObject *kwdict)
        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 f3cab05e387deb129ba80fb80bb1f125b1321fdf..b3c8ba4790f88041a762b8aa969332f905c51703 100644 (file)
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -671,12 +671,10 @@ PyObject *PyUnicode_DecodeUTF8(const char *s,
         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 @@ PyObject *PyUnicode_DecodeUTF8(const char *s,
             /* 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 6ae5084c11f62b7256fdc57ecb44e429f84fefc8..b783e807844cc495d165879208a063bfcef384c4 100644 (file)
--- a/Parser/tokenizer.c
+++ b/Parser/tokenizer.c
@@ -445,7 +445,6 @@ PyToken_ThreeChars(int c1, int c2, int c3)
                        switch (c3) {
                        case '=':
                                return LEFTSHIFTEQUAL;
-                               break;
                        }
                        break;
                }
@@ -456,7 +455,6 @@ PyToken_ThreeChars(int c1, int c2, int c3)
                        switch (c3) {
                        case '=':
                                return RIGHTSHIFTEQUAL;
-                               break;
                        }
                        break;
                }
@@ -467,7 +465,6 @@ PyToken_ThreeChars(int c1, int c2, int c3)
                        switch (c3) {
                        case '=':
                                return DOUBLESTAREQUAL;
-                               break;
                        }
                        break;
                }

diff --git a/Python/ceval.c b/Python/ceval.c
index 4f4a646149304ea2585c39782b70b45234e63521..d76c6f2766d942baaf210c336ee0c762251f59a8 100644 (file)
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -2146,7 +2146,6 @@ eval_code2(PyCodeObject *co, PyObject *globals, PyObject *locals,
                        opcode = NEXTOP();
                        oparg = oparg<<16 | NEXTARG();
                        goto dispatch_opcode;
-                       break;
 
                default:
                        fprintf(stderr,