mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 00:30:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Fix benign problems found by a picky SGI compiler (unreachable break

Browse source 
after a return).
This commit is contained in:
Guido van Rossum 1998-07-07 22:21:45 +00:00
parent eaa1ed6b42
commit c69bac539c
2 changed files with 0 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Modules/pcremodule.c
View file

@ -257,35 +257,27 @@ PyPcre_expand_escape(pattern, pattern_len, indexptr, typeptr)
case('t'): case('t'):
*indexptr=index; *indexptr=index;
return Py_BuildValue("c", (char)9); return Py_BuildValue("c", (char)9);
break;
case('n'): case('n'):
*indexptr = index; *indexptr = index;
return Py_BuildValue("c", (char)10); return Py_BuildValue("c", (char)10);
break;
case('v'): case('v'):
*indexptr = index; *indexptr = index;
return Py_BuildValue("c", (char)11); return Py_BuildValue("c", (char)11);
break;
case('r'): case('r'):
*indexptr = index; *indexptr = index;
return Py_BuildValue("c", (char)13); return Py_BuildValue("c", (char)13);
break;
case('f'): case('f'):
*indexptr = index; *indexptr = index;
return Py_BuildValue("c", (char)12); return Py_BuildValue("c", (char)12);
break;
case('a'): case('a'):
*indexptr = index; *indexptr = index;
return Py_BuildValue("c", (char)7); return Py_BuildValue("c", (char)7);
break;
case('b'): case('b'):
*indexptr=index; *indexptr=index;
return Py_BuildValue("c", (char)8); return Py_BuildValue("c", (char)8);
break;
case('\\'): case('\\'):
*indexptr=index; *indexptr=index;
return Py_BuildValue("c", '\\'); return Py_BuildValue("c", '\\');
break;
case('x'): case('x'):
{ {
@ -468,7 +460,6 @@ PyPcre_expand_escape(pattern, pattern_len, indexptr, typeptr)
*typeptr = STRING; *typeptr = STRING;
*indexptr = index; *indexptr = index;
return Py_BuildValue("s#", pattern+index-2, 2); return Py_BuildValue("s#", pattern+index-2, 2);
break;
} }
} }

11
Modules/zlibmodule.c
View file

@ -95,13 +95,11 @@ PyZlib_compress(self, args)
"Out of memory while compressing data"); "Out of memory while compressing data");
free(output); free(output);
return NULL; return NULL;
break;
case(Z_STREAM_ERROR): case(Z_STREAM_ERROR):
PyErr_SetString(ZlibError, PyErr_SetString(ZlibError,
"Bad compression level"); "Bad compression level");
free(output); free(output);
return NULL; return NULL;
break;
default: default:
{ {
if (zst.msg == Z_NULL) if (zst.msg == Z_NULL)
@ -114,7 +112,6 @@ PyZlib_compress(self, args)
free(output); free(output);
return NULL; return NULL;
} }
break;
} }
err=deflate(&zst, Z_FINISH); err=deflate(&zst, Z_FINISH);
@ -290,17 +287,14 @@ PyZlib_compressobj(selfptr, args)
{ {
case (Z_OK): case (Z_OK):
return (PyObject*)self; return (PyObject*)self;
break;
case (Z_MEM_ERROR): case (Z_MEM_ERROR):
PyErr_SetString(PyExc_MemoryError, PyErr_SetString(PyExc_MemoryError,
"Can't allocate memory for compression object"); "Can't allocate memory for compression object");
return NULL; return NULL;
break;
case(Z_STREAM_ERROR): case(Z_STREAM_ERROR):
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"Invalid initialization option"); "Invalid initialization option");
return NULL; return NULL;
break;
default: default:
{ {
if (self->zst.msg == Z_NULL) if (self->zst.msg == Z_NULL)
@ -312,7 +306,6 @@ PyZlib_compressobj(selfptr, args)
"Error %i while creating compression object: %.200s", "Error %i while creating compression object: %.200s",
err, self->zst.msg); err, self->zst.msg);
return NULL; return NULL;
break;
} }
} }
} }
@ -337,17 +330,14 @@ PyZlib_decompressobj(selfptr, args)
{ {
case (Z_OK): case (Z_OK):
return (PyObject*)self; return (PyObject*)self;
break;
case(Z_STREAM_ERROR): case(Z_STREAM_ERROR):
PyErr_SetString(PyExc_ValueError, PyErr_SetString(PyExc_ValueError,
"Invalid initialization option"); "Invalid initialization option");
return NULL; return NULL;
break;
case (Z_MEM_ERROR): case (Z_MEM_ERROR):
PyErr_SetString(PyExc_MemoryError, PyErr_SetString(PyExc_MemoryError,
"Can't allocate memory for decompression object"); "Can't allocate memory for decompression object");
return NULL; return NULL;
break;
default: default:
{ {
if (self->zst.msg == Z_NULL) if (self->zst.msg == Z_NULL)
@ -359,7 +349,6 @@ PyZlib_decompressobj(selfptr, args)
"Error %i while creating decompression object: %.200s", "Error %i while creating decompression object: %.200s",
err, self->zst.msg); err, self->zst.msg);
return NULL; return NULL;
break;
} }
} }
} }