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

gvanrossum · gvanrossum · commit c69bac539c9e · 1998-07-07T22:21:45.000Z
after a return).
diff --git 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
@@ -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;      
     }
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -95,13 +95,11 @@ PyZlib_compress(self, args)`
`95`	`95`	`"Out of memory while compressing data");`
`96`	`96`	`free(output);`
`97`	`97`	`return NULL;`
`98`		`- break;`
`99`	`98`	`case(Z_STREAM_ERROR):`
`100`	`99`	`PyErr_SetString(ZlibError,`
`101`	`100`	`"Bad compression level");`
`102`	`101`	`free(output);`
`103`	`102`	`return NULL;`
`104`		`- break;`
`105`	`103`	`default:`
`106`	`104`	`{`
`107`	`105`	`if (zst.msg == Z_NULL)`
`@@ -114,7 +112,6 @@ PyZlib_compress(self, args)`
`114`	`112`	`free(output);`
`115`	`113`	`return NULL;`
`116`	`114`	`}`
`117`		`- break;`
`118`	`115`	`}`
`119`	`116`
`120`	`117`	`err=deflate(&zst, Z_FINISH);`
`@@ -290,17 +287,14 @@ PyZlib_compressobj(selfptr, args)`
`290`	`287`	`{`
`291`	`288`	`case (Z_OK):`
`292`	`289`	`return (PyObject*)self;`
`293`		`- break;`
`294`	`290`	`case (Z_MEM_ERROR):`
`295`	`291`	`PyErr_SetString(PyExc_MemoryError,`
`296`	`292`	`"Can't allocate memory for compression object");`
`297`	`293`	`return NULL;`
`298`		`- break;`
`299`	`294`	`case(Z_STREAM_ERROR):`
`300`	`295`	`PyErr_SetString(PyExc_ValueError,`
`301`	`296`	`"Invalid initialization option");`
`302`	`297`	`return NULL;`
`303`		`- break;`
`304`	`298`	`default:`
`305`	`299`	`{`
`306`	`300`	`if (self->zst.msg == Z_NULL)`
`@@ -312,7 +306,6 @@ PyZlib_compressobj(selfptr, args)`
`312`	`306`	`"Error %i while creating compression object: %.200s",`
`313`	`307`	`err, self->zst.msg);`
`314`	`308`	`return NULL;`
`315`		`- break;`
`316`	`309`	`}`
`317`	`310`	`}`
`318`	`311`	`}`
`@@ -337,17 +330,14 @@ PyZlib_decompressobj(selfptr, args)`
`337`	`330`	`{`
`338`	`331`	`case (Z_OK):`
`339`	`332`	`return (PyObject*)self;`
`340`		`- break;`
`341`	`333`	`case(Z_STREAM_ERROR):`
`342`	`334`	`PyErr_SetString(PyExc_ValueError,`
`343`	`335`	`"Invalid initialization option");`
`344`	`336`	`return NULL;`
`345`		`- break;`
`346`	`337`	`case (Z_MEM_ERROR):`
`347`	`338`	`PyErr_SetString(PyExc_MemoryError,`
`348`	`339`	`"Can't allocate memory for decompression object");`
`349`	`340`	`return NULL;`
`350`		`- break;`
`351`	`341`	`default:`
`352`	`342`	`{`
`353`	`343`	`if (self->zst.msg == Z_NULL)`
`@@ -359,7 +349,6 @@ PyZlib_decompressobj(selfptr, args)`
`359`	`349`	`"Error %i while creating decompression object: %.200s",`
`360`	`350`	`err, self->zst.msg);`
`361`	`351`	`return NULL;`
`362`		`- break;`
`363`	`352`	`}`
`364`	`353`	`}`
`365`	`354`	`}`