Remove unreachable code

petere · petere · commit dd16f9480ac6 · 2012-07-16T22:15:03.000+03:00
The Solaris Studio compiler warns about these instances, unlike more
mainstream compilers such as gcc.  But manual inspection showed that
the code is clearly not reachable, and we hope no worthy compiler will
complain about removing this code.
diff --git a/contrib/hstore/hstore_io.c b/contrib/hstore/hstore_io.c
@@ -163,8 +163,6 @@ get_val(HSParser *state, bool ignoreeq, bool *escaped)
 
 		state->ptr++;
 	}
-
-	return false;
 }
 
 #define WKEY	0
diff --git a/contrib/intarray/_int_bool.c b/contrib/intarray/_int_bool.c
@@ -136,7 +136,6 @@ gettoken(WORKSTATE *state, int32 *val)
 		}
 		(state->buf)++;
 	}
-	return END;
 }
 
 /*
@@ -301,7 +300,6 @@ execute(ITEM *curitem, void *checkval, bool calcnot,
 		else
 			return execute(curitem - 1, checkval, calcnot, chkcond);
 	}
-	return false;
 }
 
 /*
@@ -404,7 +402,6 @@ contains_required_value(ITEM *curitem)
 		else
 			return false;
 	}
-	return false;
 }
 
 bool
diff --git a/contrib/intarray/_int_gist.c b/contrib/intarray/_int_gist.c
@@ -217,8 +217,6 @@ g_int_compress(PG_FUNCTION_ARGS)
 	}
 	else
 		PG_RETURN_POINTER(entry);
-
-	PG_RETURN_POINTER(entry);
 }
 
 Datum
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
@@ -139,7 +139,6 @@ gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint
 
 		state->buf += charlen;
 	}
-	return END;
 }
 
 /*
diff --git a/contrib/ltree/ltxtquery_op.c b/contrib/ltree/ltxtquery_op.c
@@ -40,7 +40,6 @@ ltree_execute(ITEM *curitem, void *checkval, bool calcnot, bool (*chkcond) (void
 		else
 			return ltree_execute(curitem + 1, checkval, calcnot, chkcond);
 	}
-	return false;
 }
 
 typedef struct
diff --git a/src/backend/access/gin/ginbtree.c b/src/backend/access/gin/ginbtree.c
@@ -146,9 +146,6 @@ ginFindLeafPage(GinBtree btree, GinBtreeStack *stack)
 			stack->predictNumber = 1;
 		}
 	}
-
-	/* keep compiler happy */
-	return NULL;
 }
 
 void
diff --git a/src/backend/access/gin/ginget.c b/src/backend/access/gin/ginget.c
@@ -354,8 +354,6 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack,
 		 */
 		stack->off++;
 	}
-
-	return true;
 }
 
 /*
diff --git a/src/backend/access/gist/gistget.c b/src/backend/access/gist/gistget.c
@@ -535,8 +535,6 @@ gistgettuple(PG_FUNCTION_ARGS)
 			} while (so->nPageData == 0);
 		}
 	}
-
-	PG_RETURN_BOOL(false);		/* keep compiler quiet */
 }
 
 /*
diff --git a/src/backend/executor/nodeGroup.c b/src/backend/executor/nodeGroup.c
@@ -184,9 +184,6 @@ ExecGroup(GroupState *node)
 		else
 			InstrCountFiltered1(node, 1);
 	}
-
-	/* NOTREACHED */
-	return NULL;
 }
 
 /* -----------------
diff --git a/src/backend/libpq/be-secure.c b/src/backend/libpq/be-secure.c
@@ -201,9 +201,9 @@ secure_loaded_verify_locations(void)
 {
 #ifdef USE_SSL
 	return ssl_loaded_verify_locations;
-#endif
-
+#else
 	return false;
+#endif
 }
 
 /*
diff --git a/src/backend/storage/buffer/freelist.c b/src/backend/storage/buffer/freelist.c
@@ -233,9 +233,6 @@ StrategyGetBuffer(BufferAccessStrategy strategy, bool *lock_held)
 		}
 		UnlockBufHdr(buf);
 	}
-
-	/* not reached */
-	return NULL;
 }
 
 /*
diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
@@ -4198,11 +4198,6 @@ PostgresMain(int argc, char *argv[], const char *username)
 								firstchar)));
 		}
 	}							/* end of input-reading loop */
-
-	/* can't get here because the above loop never exits */
-	Assert(false);
-
-	abort();					/* keep compiler quiet */
 }
 
 
diff --git a/src/backend/tsearch/dict_thesaurus.c b/src/backend/tsearch/dict_thesaurus.c
@@ -744,8 +744,6 @@ findVariant(LexemeInfo *in, LexemeInfo *stored, uint16 curpos, LexemeInfo **newi
 		for (i = 0; i < newn; i++)
 			newin[i] = newin[i]->nextentry;
 	}
-
-	return NULL;
 }
 
 static TSLexeme *
diff --git a/src/backend/utils/adt/formatting.c b/src/backend/utils/adt/formatting.c
@@ -1439,7 +1439,6 @@ get_th(char *num, int type)
 				return numTH[3];
 			return numth[3];
 	}
-	return NULL;
 }
 
 /* ----------
diff --git a/src/backend/utils/adt/tsquery.c b/src/backend/utils/adt/tsquery.c
@@ -216,7 +216,6 @@ gettoken_query(TSQueryParserState state,
 		}
 		state->buf += pg_mblen(state->buf);
 	}
-	return PT_END;
 }
 
 /*
diff --git a/src/backend/utils/adt/tsvector_parser.c b/src/backend/utils/adt/tsvector_parser.c
@@ -362,6 +362,4 @@ gettoken_tsvector(TSVectorParseState state,
 		/* get next char */
 		state->prsbuf += pg_mblen(state->prsbuf);
 	}
-
-	return false;
 }
diff --git a/src/bin/pg_basebackup/pg_receivexlog.c b/src/bin/pg_basebackup/pg_receivexlog.c
@@ -435,7 +435,4 @@ main(int argc, char **argv)
 			pg_usleep(RECONNECT_SLEEP_TIME * 1000000);
 		}
 	}
-
-	/* Never get here */
-	exit(2);
 }
diff --git a/src/bin/psql/variables.c b/src/bin/psql/variables.c
@@ -115,8 +115,6 @@ ParseVariableBool(const char *value)
 		psql_error("unrecognized Boolean value; assuming \"on\"\n");
 		return true;
 	}
-	/* suppress compiler warning */
-	return true;
 }
 
 
diff --git a/src/interfaces/ecpg/ecpglib/typename.c b/src/interfaces/ecpg/ecpglib/typename.c
@@ -65,7 +65,6 @@ ecpg_type_name(enum ECPGttype typ)
 		default:
 			abort();
 	}
-	return NULL;
 }
 
 int
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
@@ -1663,8 +1663,6 @@ exec_stmt_loop(PLpgSQL_execstate *estate, PLpgSQL_stmt_loop *stmt)
 				elog(ERROR, "unrecognized rc: %d", rc);
 		}
 	}
-
-	return PLPGSQL_RC_OK;
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,6 @@ get_val(HSParser state, bool ignoreeq, bool escaped)`
`163`	`163`
`164`	`164`	`state->ptr++;`
`165`	`165`	`}`
`166`		`-`
`167`		`- return false;`
`168`	`166`	`}`
`169`	`167`
`170`	`168`	`#define WKEY 0`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,6 @@ gettoken(WORKSTATE state, int32 val)`
`136`	`136`	`}`
`137`	`137`	`(state->buf)++;`
`138`	`138`	`}`
`139`		`- return END;`
`140`	`139`	`}`
`141`	`140`
`142`	`141`	`/*`
`@@ -301,7 +300,6 @@ execute(ITEM curitem, void checkval, bool calcnot,`
`301`	`300`	`else`
`302`	`301`	`return execute(curitem - 1, checkval, calcnot, chkcond);`
`303`	`302`	`}`
`304`		`- return false;`
`305`	`303`	`}`
`306`	`304`
`307`	`305`	`/*`
`@@ -404,7 +402,6 @@ contains_required_value(ITEM *curitem)`
`404`	`402`	`else`
`405`	`403`	`return false;`
`406`	`404`	`}`
`407`		`- return false;`
`408`	`405`	`}`
`409`	`406`
`410`	`407`	`bool`
Original file line number	Diff line number	Diff line change
`@@ -217,8 +217,6 @@ g_int_compress(PG_FUNCTION_ARGS)`
`217`	`217`	`}`
`218`	`218`	`else`
`219`	`219`	`PG_RETURN_POINTER(entry);`
`220`		`-`
`221`		`- PG_RETURN_POINTER(entry);`
`222`	`220`	`}`
`223`	`221`
`224`	`222`	`Datum`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,6 @@ gettoken_query(QPRS_STATE state, int32 val, int32 lenval, char *strval, uint`
`139`	`139`
`140`	`140`	`state->buf += charlen;`
`141`	`141`	`}`
`142`		`- return END;`
`143`	`142`	`}`
`144`	`143`
`145`	`144`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,6 @@ ltree_execute(ITEM curitem, void checkval, bool calcnot, bool (*chkcond) (void`
`40`	`40`	`else`
`41`	`41`	`return ltree_execute(curitem + 1, checkval, calcnot, chkcond);`
`42`	`42`	`}`
`43`		`- return false;`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`typedef struct`
Original file line number	Diff line number	Diff line change
`@@ -146,9 +146,6 @@ ginFindLeafPage(GinBtree btree, GinBtreeStack *stack)`
`146`	`146`	`stack->predictNumber = 1;`
`147`	`147`	`}`
`148`	`148`	`}`
`149`		`-`
`150`		`- /* keep compiler happy */`
`151`		`- return NULL;`
`152`	`149`	`}`
`153`	`150`
`154`	`151`	`void`
Original file line number	Diff line number	Diff line change
`@@ -354,8 +354,6 @@ collectMatchBitmap(GinBtreeData btree, GinBtreeStack stack,`
`354`	`354`	`*/`
`355`	`355`	`stack->off++;`
`356`	`356`	`}`
`357`		`-`
`358`		`- return true;`
`359`	`357`	`}`
`360`	`358`
`361`	`359`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -535,8 +535,6 @@ gistgettuple(PG_FUNCTION_ARGS)`
`535`	`535`	`} while (so->nPageData == 0);`
`536`	`536`	`}`
`537`	`537`	`}`
`538`		`-`
`539`		`- PG_RETURN_BOOL(false); /* keep compiler quiet */`
`540`	`538`	`}`
`541`	`539`
`542`	`540`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -184,9 +184,6 @@ ExecGroup(GroupState *node)`
`184`	`184`	`else`
`185`	`185`	`InstrCountFiltered1(node, 1);`
`186`	`186`	`}`
`187`		`-`
`188`		`- /* NOTREACHED */`
`189`		`- return NULL;`
`190`	`187`	`}`
`191`	`188`
`192`	`189`	`/* -----------------`
Original file line number	Diff line number	Diff line change
`@@ -201,9 +201,9 @@ secure_loaded_verify_locations(void)`
`201`	`201`	`{`
`202`	`202`	`#ifdef USE_SSL`
`203`	`203`	`return ssl_loaded_verify_locations;`
`204`		`-#endif`
`205`		`-`
	`204`	`+#else`
`206`	`205`	`return false;`
	`206`	`+#endif`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`/*`