Remove duplicate variable initializations identified by clang static checker.

One of these represents a nontrivial bug (a promptly-leaked palloc), so
backpatch.

Greg Stark
This commit is contained in:
Tom Lane 2009-08-30 16:53:45 +00:00
parent 143373bee5
commit d40ef0dc0b
3 changed files with 5 additions and 6 deletions

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tsearch/regis.c,v 1.4 2008/01/21 02:46:10 tgl Exp $ * $PostgreSQL: pgsql/src/backend/tsearch/regis.c,v 1.4.2.1 2009/08/30 16:53:45 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -182,7 +182,7 @@ RS_free(Regis *r)
static bool static bool
mb_strchr(char *str, char *c) mb_strchr(char *str, char *c)
{ {
int clen = pg_mblen(c), int clen,
plen, plen,
i; i;
char *ptr = str; char *ptr = str;

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/tsearch/ts_parse.c,v 1.7.2.1 2009/01/15 17:06:03 teodor Exp $ * $PostgreSQL: pgsql/src/backend/tsearch/ts_parse.c,v 1.7.2.2 2009/08/30 16:53:45 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -102,7 +102,6 @@ LexizeAddLemm(LexizeData *ld, int type, char *lemm, int lenlemm)
{ {
ParsedLex *newpl = (ParsedLex *) palloc(sizeof(ParsedLex)); ParsedLex *newpl = (ParsedLex *) palloc(sizeof(ParsedLex));
newpl = (ParsedLex *) palloc(sizeof(ParsedLex));
newpl->type = type; newpl->type = type;
newpl->lemm = lemm; newpl->lemm = lemm;
newpl->lenlemm = lenlemm; newpl->lenlemm = lenlemm;

View File

@ -7,7 +7,7 @@
* *
* *
* IDENTIFICATION * IDENTIFICATION
* $PostgreSQL: pgsql/src/backend/utils/adt/encode.c,v 1.20.2.1 2008/02/26 02:54:14 tgl Exp $ * $PostgreSQL: pgsql/src/backend/utils/adt/encode.c,v 1.20.2.2 2009/08/30 16:53:45 tgl Exp $
* *
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
@ -159,7 +159,7 @@ hex_decode(const char *src, unsigned len, char *dst)
*srcend; *srcend;
char v1, char v1,
v2, v2,
*p = dst; *p;
srcend = src + len; srcend = src + len;
s = src; s = src;