summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGuido van Rossum <guido@python.org>1998-07-07 22:21:45 (GMT)
committerGuido van Rossum <guido@python.org>1998-07-07 22:21:45 (GMT)
commitc69bac539c9e5ff2f9c8e9b6d1cb57ca994a973b (patch)
treed6dc66f1026745610ebff0dc3b5da95a5ca0be6a
parenteaa1ed6b42a188ff33362b47885b18993a2e0141 (diff)
downloadcpython-c69bac539c9e5ff2f9c8e9b6d1cb57ca994a973b.zip
cpython-c69bac539c9e5ff2f9c8e9b6d1cb57ca994a973b.tar.gz
cpython-c69bac539c9e5ff2f9c8e9b6d1cb57ca994a973b.tar.bz2
Fix benign problems found by a picky SGI compiler (unreachable break
after a return).
-rw-r--r--Modules/pcremodule.c9
-rw-r--r--Modules/zlibmodule.c11
2 files changed, 0 insertions, 20 deletions
diff --git a/Modules/pcremodule.c b/Modules/pcremodule.c
index 40efd03..60b7029 100644
--- a/Modules/pcremodule.c
+++ b/Modules/pcremodule.c
@@ -257,35 +257,27 @@ PyPcre_expand_escape(pattern, pattern_len, indexptr, typeptr)
case('t'):
*indexptr=index;
return Py_BuildValue("c", (char)9);
- break;
case('n'):
*indexptr = index;
return Py_BuildValue("c", (char)10);
- break;
case('v'):
*indexptr = index;
return Py_BuildValue("c", (char)11);
- break;
case('r'):
*indexptr = index;
return Py_BuildValue("c", (char)13);
- break;
case('f'):
*indexptr = index;
return Py_BuildValue("c", (char)12);
- break;
case('a'):
*indexptr = index;
return Py_BuildValue("c", (char)7);
- break;
case('b'):
*indexptr=index;
return Py_BuildValue("c", (char)8);
- break;
case('\\'):
*indexptr=index;
return Py_BuildValue("c", '\\');
- break;
case('x'):
{
@@ -468,7 +460,6 @@ PyPcre_expand_escape(pattern, pattern_len, indexptr, typeptr)
*typeptr = STRING;
*indexptr = index;
return Py_BuildValue("s#", pattern+index-2, 2);
- break;
}
}
diff --git a/Modules/zlibmodule.c b/Modules/zlibmodule.c
index 5569de6..fc892d0 100644
--- a/Modules/zlibmodule.c
+++ b/Modules/zlibmodule.c
@@ -95,13 +95,11 @@ PyZlib_compress(self, args)
"Out of memory while compressing data");
free(output);
return NULL;
- break;
case(Z_STREAM_ERROR):
PyErr_SetString(ZlibError,
"Bad compression level");
free(output);
return NULL;
- break;
default:
{
if (zst.msg == Z_NULL)
@@ -114,7 +112,6 @@ PyZlib_compress(self, args)
free(output);
return NULL;
}
- break;
}
err=deflate(&zst, Z_FINISH);
@@ -290,17 +287,14 @@ PyZlib_compressobj(selfptr, args)
{
case (Z_OK):
return (PyObject*)self;
- break;
case (Z_MEM_ERROR):
PyErr_SetString(PyExc_MemoryError,
"Can't allocate memory for compression object");
return NULL;
- break;
case(Z_STREAM_ERROR):
PyErr_SetString(PyExc_ValueError,
"Invalid initialization option");
return NULL;
- break;
default:
{
if (self->zst.msg == Z_NULL)
@@ -312,7 +306,6 @@ PyZlib_compressobj(selfptr, args)
"Error %i while creating compression object: %.200s",
err, self->zst.msg);
return NULL;
- break;
}
}
}
@@ -337,17 +330,14 @@ PyZlib_decompressobj(selfptr, args)
{
case (Z_OK):
return (PyObject*)self;
- break;
case(Z_STREAM_ERROR):
PyErr_SetString(PyExc_ValueError,
"Invalid initialization option");
return NULL;
- break;
case (Z_MEM_ERROR):
PyErr_SetString(PyExc_MemoryError,
"Can't allocate memory for decompression object");
return NULL;
- break;
default:
{
if (self->zst.msg == Z_NULL)
@@ -359,7 +349,6 @@ PyZlib_decompressobj(selfptr, args)
"Error %i while creating decompression object: %.200s",
err, self->zst.msg);
return NULL;
- break;
}
}
}