aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHeikki Linnakangas <heikki.linnakangas@iki.fi>2015-03-31 15:12:27 +0300
committerHeikki Linnakangas <heikki.linnakangas@iki.fi>2015-03-31 15:12:27 +0300
commit1d0db8de043c28c1e665451663ec101da5adc5ab (patch)
tree5eae21018c2202cede3fbd3888b0934276edb74b
parentfa1e5afa8a26d467aec7c8b36a0b749b690f636c (diff)
downloadpostgresql-1d0db8de043c28c1e665451663ec101da5adc5ab.tar.gz
postgresql-1d0db8de043c28c1e665451663ec101da5adc5ab.zip
Remove spurious semicolons.
Petr Jelinek
-rw-r--r--contrib/postgres_fdw/deparse.c2
-rw-r--r--src/backend/parser/gram.y2
-rw-r--r--src/backend/replication/repl_gram.y2
-rw-r--r--src/backend/utils/adt/json.c2
-rw-r--r--src/backend/utils/adt/jsonb.c6
-rw-r--r--src/backend/utils/adt/jsonfuncs.c2
-rw-r--r--src/backend/utils/adt/oracle_compat.c2
7 files changed, 9 insertions, 9 deletions
diff --git a/contrib/postgres_fdw/deparse.c b/contrib/postgres_fdw/deparse.c
index 59cb053e4f4..94fab18c425 100644
--- a/contrib/postgres_fdw/deparse.c
+++ b/contrib/postgres_fdw/deparse.c
@@ -317,7 +317,7 @@ foreign_expr_walker(Node *node,
break;
case T_ArrayRef:
{
- ArrayRef *ar = (ArrayRef *) node;;
+ ArrayRef *ar = (ArrayRef *) node;
/* Assignment should not be in restrictions. */
if (ar->refassgnexpr != NULL)
diff --git a/src/backend/parser/gram.y b/src/backend/parser/gram.y
index 3aa9e42b5ea..88ec83c7c38 100644
--- a/src/backend/parser/gram.y
+++ b/src/backend/parser/gram.y
@@ -14308,7 +14308,7 @@ makeRangeVarFromAnyName(List *names, int position, core_yyscan_t yyscanner)
r->relname = strVal(lsecond(names));
break;
case 3:
- r->catalogname = strVal(linitial(names));;
+ r->catalogname = strVal(linitial(names));
r->schemaname = strVal(lsecond(names));
r->relname = strVal(lthird(names));
break;
diff --git a/src/backend/replication/repl_gram.y b/src/backend/replication/repl_gram.y
index 2a41eb148fd..7d6d154f9c2 100644
--- a/src/backend/replication/repl_gram.y
+++ b/src/backend/replication/repl_gram.y
@@ -226,7 +226,7 @@ start_logical_replication:
{
StartReplicationCmd *cmd;
cmd = makeNode(StartReplicationCmd);
- cmd->kind = REPLICATION_KIND_LOGICAL;;
+ cmd->kind = REPLICATION_KIND_LOGICAL;
cmd->slotname = $3;
cmd->startpoint = $5;
cmd->options = $6;
diff --git a/src/backend/utils/adt/json.c b/src/backend/utils/adt/json.c
index d0d7206ae93..f08e288c21d 100644
--- a/src/backend/utils/adt/json.c
+++ b/src/backend/utils/adt/json.c
@@ -165,7 +165,7 @@ static inline void
lex_expect(JsonParseContext ctx, JsonLexContext *lex, JsonTokenType token)
{
if (!lex_accept(lex, token, NULL))
- report_parse_error(ctx, lex);;
+ report_parse_error(ctx, lex);
}
/* chars to consider as part of an alphanumeric token */
diff --git a/src/backend/utils/adt/jsonb.c b/src/backend/utils/adt/jsonb.c
index 5833401eb19..7e2c359b219 100644
--- a/src/backend/utils/adt/jsonb.c
+++ b/src/backend/utils/adt/jsonb.c
@@ -1592,7 +1592,7 @@ jsonb_agg_transfn(PG_FUNCTION_ARGS)
if (v.type == jbvString)
{
/* copy string values in the aggregate context */
- char *buf = palloc(v.val.string.len + 1);;
+ char *buf = palloc(v.val.string.len + 1);
snprintf(buf, v.val.string.len + 1, "%s", v.val.string.val);
v.val.string.val = buf;
}
@@ -1753,7 +1753,7 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
if (v.type == jbvString)
{
/* copy string values in the aggregate context */
- char *buf = palloc(v.val.string.len + 1);;
+ char *buf = palloc(v.val.string.len + 1);
snprintf(buf, v.val.string.len + 1, "%s", v.val.string.val);
v.val.string.val = buf;
}
@@ -1811,7 +1811,7 @@ jsonb_object_agg_transfn(PG_FUNCTION_ARGS)
if (v.type == jbvString)
{
/* copy string values in the aggregate context */
- char *buf = palloc(v.val.string.len + 1);;
+ char *buf = palloc(v.val.string.len + 1);
snprintf(buf, v.val.string.len + 1, "%s", v.val.string.val);
v.val.string.val = buf;
}
diff --git a/src/backend/utils/adt/jsonfuncs.c b/src/backend/utils/adt/jsonfuncs.c
index a8cdeaa393c..274f64c95f8 100644
--- a/src/backend/utils/adt/jsonfuncs.c
+++ b/src/backend/utils/adt/jsonfuncs.c
@@ -2675,7 +2675,7 @@ populate_recordset_worker(FunctionCallInfo fcinfo, const char *funcname,
/* make these in a sufficiently long-lived memory context */
old_cxt = MemoryContextSwitchTo(rsi->econtext->ecxt_per_query_memory);
- state->ret_tdesc = CreateTupleDescCopy(tupdesc);;
+ state->ret_tdesc = CreateTupleDescCopy(tupdesc);
BlessTupleDesc(state->ret_tdesc);
state->tuple_store = tuplestore_begin_heap(rsi->allowedModes &
SFRM_Materialize_Random,
diff --git a/src/backend/utils/adt/oracle_compat.c b/src/backend/utils/adt/oracle_compat.c
index 723be9ac0c1..8e896ebf16b 100644
--- a/src/backend/utils/adt/oracle_compat.c
+++ b/src/backend/utils/adt/oracle_compat.c
@@ -959,7 +959,7 @@ chr (PG_FUNCTION_ARGS)
if (bytes == 2)
{
wch[0] = 0xC0 | ((cvalue >> 6) & 0x1F);
- wch[1] = 0x80 | (cvalue & 0x3F);;
+ wch[1] = 0x80 | (cvalue & 0x3F);
}
else if (bytes == 3)
{