From 74b4d78e037c1d4d55fd61f1b58c161e6249dfde Mon Sep 17 00:00:00 2001 From: Amit Kapila Date: Sat, 20 Jun 2020 09:18:57 +0530 Subject: [PATCH] Removal unused function parameter in CopyReadBinaryAttribute. The function parameter column_no is not used in CopyReadBinaryAttribute, this can be removed. Commit 0e319c7ad7 removed the usage of column_no parameter in function CopyReadBinaryAttribute but forgot to remove the parameter. Reported-by: Vignesh C Author: Vignesh C Discussion: https://postgr.es/m/CALDaNm1TYSNTfqx_jfz9_mwEZ2Er=dZnu++duXpC1uQo1cG=WA@mail.gmail.com --- src/backend/commands/copy.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/backend/commands/copy.c b/src/backend/commands/copy.c index 6d53dc463c..6b1fd6d4cc 100644 --- a/src/backend/commands/copy.c +++ b/src/backend/commands/copy.c @@ -367,8 +367,7 @@ static bool CopyReadLine(CopyState cstate); static bool CopyReadLineText(CopyState cstate); static int CopyReadAttributesText(CopyState cstate); static int CopyReadAttributesCSV(CopyState cstate); -static Datum CopyReadBinaryAttribute(CopyState cstate, - int column_no, FmgrInfo *flinfo, +static Datum CopyReadBinaryAttribute(CopyState cstate, FmgrInfo *flinfo, Oid typioparam, int32 typmod, bool *isnull); static void CopyAttributeOutText(CopyState cstate, char *string); @@ -3776,7 +3775,6 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext, errmsg("row field count is %d, expected %d", (int) fld_count, attr_count))); - i = 0; foreach(cur, cstate->attnumlist) { int attnum = lfirst_int(cur); @@ -3784,9 +3782,7 @@ NextCopyFrom(CopyState cstate, ExprContext *econtext, Form_pg_attribute att = TupleDescAttr(tupDesc, m); cstate->cur_attname = NameStr(att->attname); - i++; values[m] = CopyReadBinaryAttribute(cstate, - i, &in_functions[m], typioparams[m], att->atttypmod, @@ -4714,8 +4710,7 @@ endfield: * Read a binary attribute */ static Datum -CopyReadBinaryAttribute(CopyState cstate, - int column_no, FmgrInfo *flinfo, +CopyReadBinaryAttribute(CopyState cstate, FmgrInfo *flinfo, Oid typioparam, int32 typmod, bool *isnull) {