Skip to content

Commit

Permalink
Remove unreachable code
Browse files Browse the repository at this point in the history
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
petere committed Jul 16, 2012
1 parent a76c857 commit dd16f94
Show file tree
Hide file tree
Showing 20 changed files with 2 additions and 43 deletions.
2 changes: 0 additions & 2 deletions contrib/hstore/hstore_io.c
Expand Up @@ -163,8 +163,6 @@ get_val(HSParser *state, bool ignoreeq, bool *escaped)


state->ptr++; state->ptr++;
} }

return false;
} }


#define WKEY 0 #define WKEY 0
Expand Down
3 changes: 0 additions & 3 deletions contrib/intarray/_int_bool.c
Expand Up @@ -136,7 +136,6 @@ gettoken(WORKSTATE *state, int32 *val)
} }
(state->buf)++; (state->buf)++;
} }
return END;
} }


/* /*
Expand Down Expand Up @@ -301,7 +300,6 @@ execute(ITEM *curitem, void *checkval, bool calcnot,
else else
return execute(curitem - 1, checkval, calcnot, chkcond); return execute(curitem - 1, checkval, calcnot, chkcond);
} }
return false;
} }


/* /*
Expand Down Expand Up @@ -404,7 +402,6 @@ contains_required_value(ITEM *curitem)
else else
return false; return false;
} }
return false;
} }


bool bool
Expand Down
2 changes: 0 additions & 2 deletions contrib/intarray/_int_gist.c
Expand Up @@ -217,8 +217,6 @@ g_int_compress(PG_FUNCTION_ARGS)
} }
else else
PG_RETURN_POINTER(entry); PG_RETURN_POINTER(entry);

PG_RETURN_POINTER(entry);
} }


Datum Datum
Expand Down
1 change: 0 additions & 1 deletion contrib/ltree/ltxtquery_io.c
Expand Up @@ -139,7 +139,6 @@ gettoken_query(QPRS_STATE *state, int32 *val, int32 *lenval, char **strval, uint


state->buf += charlen; state->buf += charlen;
} }
return END;
} }


/* /*
Expand Down
1 change: 0 additions & 1 deletion contrib/ltree/ltxtquery_op.c
Expand Up @@ -40,7 +40,6 @@ ltree_execute(ITEM *curitem, void *checkval, bool calcnot, bool (*chkcond) (void
else else
return ltree_execute(curitem + 1, checkval, calcnot, chkcond); return ltree_execute(curitem + 1, checkval, calcnot, chkcond);
} }
return false;
} }


typedef struct typedef struct
Expand Down
3 changes: 0 additions & 3 deletions src/backend/access/gin/ginbtree.c
Expand Up @@ -146,9 +146,6 @@ ginFindLeafPage(GinBtree btree, GinBtreeStack *stack)
stack->predictNumber = 1; stack->predictNumber = 1;
} }
} }

/* keep compiler happy */
return NULL;
} }


void void
Expand Down
2 changes: 0 additions & 2 deletions src/backend/access/gin/ginget.c
Expand Up @@ -354,8 +354,6 @@ collectMatchBitmap(GinBtreeData *btree, GinBtreeStack *stack,
*/ */
stack->off++; stack->off++;
} }

return true;
} }


/* /*
Expand Down
2 changes: 0 additions & 2 deletions src/backend/access/gist/gistget.c
Expand Up @@ -535,8 +535,6 @@ gistgettuple(PG_FUNCTION_ARGS)
} while (so->nPageData == 0); } while (so->nPageData == 0);
} }
} }

PG_RETURN_BOOL(false); /* keep compiler quiet */
} }


/* /*
Expand Down
3 changes: 0 additions & 3 deletions src/backend/executor/nodeGroup.c
Expand Up @@ -184,9 +184,6 @@ ExecGroup(GroupState *node)
else else
InstrCountFiltered1(node, 1); InstrCountFiltered1(node, 1);
} }

/* NOTREACHED */
return NULL;
} }


/* ----------------- /* -----------------
Expand Down
4 changes: 2 additions & 2 deletions src/backend/libpq/be-secure.c
Expand Up @@ -201,9 +201,9 @@ secure_loaded_verify_locations(void)
{ {
#ifdef USE_SSL #ifdef USE_SSL
return ssl_loaded_verify_locations; return ssl_loaded_verify_locations;
#endif #else

return false; return false;
#endif
} }


/* /*
Expand Down
3 changes: 0 additions & 3 deletions src/backend/storage/buffer/freelist.c
Expand Up @@ -233,9 +233,6 @@ StrategyGetBuffer(BufferAccessStrategy strategy, bool *lock_held)
} }
UnlockBufHdr(buf); UnlockBufHdr(buf);
} }

/* not reached */
return NULL;
} }


/* /*
Expand Down
5 changes: 0 additions & 5 deletions src/backend/tcop/postgres.c
Expand Up @@ -4198,11 +4198,6 @@ PostgresMain(int argc, char *argv[], const char *username)
firstchar))); firstchar)));
} }
} /* end of input-reading loop */ } /* end of input-reading loop */

/* can't get here because the above loop never exits */
Assert(false);

abort(); /* keep compiler quiet */
} }




Expand Down
2 changes: 0 additions & 2 deletions src/backend/tsearch/dict_thesaurus.c
Expand Up @@ -744,8 +744,6 @@ findVariant(LexemeInfo *in, LexemeInfo *stored, uint16 curpos, LexemeInfo **newi
for (i = 0; i < newn; i++) for (i = 0; i < newn; i++)
newin[i] = newin[i]->nextentry; newin[i] = newin[i]->nextentry;
} }

return NULL;
} }


static TSLexeme * static TSLexeme *
Expand Down
1 change: 0 additions & 1 deletion src/backend/utils/adt/formatting.c
Expand Up @@ -1439,7 +1439,6 @@ get_th(char *num, int type)
return numTH[3]; return numTH[3];
return numth[3]; return numth[3];
} }
return NULL;
} }


/* ---------- /* ----------
Expand Down
1 change: 0 additions & 1 deletion src/backend/utils/adt/tsquery.c
Expand Up @@ -216,7 +216,6 @@ gettoken_query(TSQueryParserState state,
} }
state->buf += pg_mblen(state->buf); state->buf += pg_mblen(state->buf);
} }
return PT_END;
} }


/* /*
Expand Down
2 changes: 0 additions & 2 deletions src/backend/utils/adt/tsvector_parser.c
Expand Up @@ -362,6 +362,4 @@ gettoken_tsvector(TSVectorParseState state,
/* get next char */ /* get next char */
state->prsbuf += pg_mblen(state->prsbuf); state->prsbuf += pg_mblen(state->prsbuf);
} }

return false;
} }
3 changes: 0 additions & 3 deletions src/bin/pg_basebackup/pg_receivexlog.c
Expand Up @@ -435,7 +435,4 @@ main(int argc, char **argv)
pg_usleep(RECONNECT_SLEEP_TIME * 1000000); pg_usleep(RECONNECT_SLEEP_TIME * 1000000);
} }
} }

/* Never get here */
exit(2);
} }
2 changes: 0 additions & 2 deletions src/bin/psql/variables.c
Expand Up @@ -115,8 +115,6 @@ ParseVariableBool(const char *value)
psql_error("unrecognized Boolean value; assuming \"on\"\n"); psql_error("unrecognized Boolean value; assuming \"on\"\n");
return true; return true;
} }
/* suppress compiler warning */
return true;
} }




Expand Down
1 change: 0 additions & 1 deletion src/interfaces/ecpg/ecpglib/typename.c
Expand Up @@ -65,7 +65,6 @@ ecpg_type_name(enum ECPGttype typ)
default: default:
abort(); abort();
} }
return NULL;
} }


int int
Expand Down
2 changes: 0 additions & 2 deletions src/pl/plpgsql/src/pl_exec.c
Expand Up @@ -1663,8 +1663,6 @@ exec_stmt_loop(PLpgSQL_execstate *estate, PLpgSQL_stmt_loop *stmt)
elog(ERROR, "unrecognized rc: %d", rc); elog(ERROR, "unrecognized rc: %d", rc);
} }
} }

return PLPGSQL_RC_OK;
} }




Expand Down

0 comments on commit dd16f94

Please sign in to comment.