Permalink
Browse files

Remove unreachable code

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.
  • Loading branch information...
1 parent a76c857 commit dd16f9480ac67ab0c6b0102d110cd5121ed9ab46 @petere petere committed Jul 16, 2012
@@ -163,8 +163,6 @@ get_val(HSParser *state, bool ignoreeq, bool *escaped)
state->ptr++;
}
-
- return false;
}
#define WKEY 0
@@ -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
@@ -217,8 +217,6 @@ g_int_compress(PG_FUNCTION_ARGS)
}
else
PG_RETURN_POINTER(entry);
-
- PG_RETURN_POINTER(entry);
}
Datum
@@ -139,7 +139,6 @@ gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint
state->buf += charlen;
}
- return END;
}
/*
@@ -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
@@ -146,9 +146,6 @@ ginFindLeafPage(GinBtree btree, GinBtreeStack *stack)
stack->predictNumber = 1;
}
}
-
- /* keep compiler happy */
- return NULL;
}
void
@@ -354,8 +354,6 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack,
*/
stack->off++;
}
-
- return true;
}
/*
@@ -535,8 +535,6 @@ gistgettuple(PG_FUNCTION_ARGS)
} while (so->nPageData == 0);
}
}
-
- PG_RETURN_BOOL(false); /* keep compiler quiet */
}
/*
@@ -184,9 +184,6 @@ ExecGroup(GroupState *node)
else
InstrCountFiltered1(node, 1);
}
-
- /* NOTREACHED */
- return NULL;
}
/* -----------------
@@ -201,9 +201,9 @@ secure_loaded_verify_locations(void)
{
#ifdef USE_SSL
return ssl_loaded_verify_locations;
-#endif
-
+#else
return false;
+#endif
}
/*
@@ -233,9 +233,6 @@ StrategyGetBuffer(BufferAccessStrategy strategy, bool *lock_held)
}
UnlockBufHdr(buf);
}
-
- /* not reached */
- return NULL;
}
/*
@@ -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 */
}
@@ -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 *
@@ -1439,7 +1439,6 @@ get_th(char *num, int type)
return numTH[3];
return numth[3];
}
- return NULL;
}
/* ----------
@@ -216,7 +216,6 @@ gettoken_query(TSQueryParserState state,
}
state->buf += pg_mblen(state->buf);
}
- return PT_END;
}
/*
@@ -362,6 +362,4 @@ gettoken_tsvector(TSVectorParseState state,
/* get next char */
state->prsbuf += pg_mblen(state->prsbuf);
}
-
- return false;
}
@@ -435,7 +435,4 @@ main(int argc, char **argv)
pg_usleep(RECONNECT_SLEEP_TIME * 1000000);
}
}
-
- /* Never get here */
- exit(2);
}
@@ -115,8 +115,6 @@ ParseVariableBool(const char *value)
psql_error("unrecognized Boolean value; assuming \"on\"\n");
return true;
}
- /* suppress compiler warning */
- return true;
}
@@ -65,7 +65,6 @@ ecpg_type_name(enum ECPGttype typ)
default:
abort();
}
- return NULL;
}
int
@@ -1663,8 +1663,6 @@ exec_stmt_loop(PLpgSQL_execstate *estate, PLpgSQL_stmt_loop *stmt)
elog(ERROR, "unrecognized rc: %d", rc);
}
}
-
- return PLPGSQL_RC_OK;
}

0 comments on commit dd16f94

Please sign in to comment.