make scan-build happy once again

Author: zilder

src/partition_filter.c

@@ -383,7 +383,7 @@ find_partition_for_value(Datum value, Oid value_type,
 #define CopyToTempConst(const_field, attr_field) \
 	( temp_const.const_field = prel->attr_field )
 
-	Oid				result;
+	Oid				result = InvalidOid;
 	Const			temp_const;	/* temporary const for expr walker */
 	WalkerContext	wcxt;
 	List		   *ranges = NIL;

src/pl_funcs.c

@@ -531,9 +531,9 @@ tuple_format_is_convertable(PG_FUNCTION_ARGS)
 	PG_TRY();
 	{
 		/* Try to build a conversion map */
-		(void) convert_tuples_by_name_map(rel1->rd_att,
-						   				  rel2->rd_att,
-							   			  "doesn't matter");
+		(void) convert_tuples_by_name(rel1->rd_att,
+						   			  rel2->rd_att,
+							   		  "doesn't matter");
 	}
 	PG_CATCH();
 	{

src/ref_integrity.c

@@ -1340,7 +1340,6 @@ create_foreign_key_internal(Oid fk_table,
 									  fk_table,
 									  &fk_attnum,
 									  1,
-									  1,
 									  InvalidOid,		/* not a domain
 														 * constraint */
 									  indexOid,
@@ -1729,8 +1728,12 @@ get_index_for_key(Relation rel, AttrNumber attnum, Oid *index_id)
 		 * Must have the right number of columns; must be unique and not a
 		 * partial index; forget it if there are any expressions, too. Invalid
 		 * indexes are out as well.
+		 *
+		 * TODO: in postgres 10 there is indnkeyatts attribute we must check
+		 * instead of indnatts. We should keep this in mind when we adapt
+		 * to the newer version.
 		 */
-		if (indexStruct->indnkeyatts == 1 &&
+		if (indexStruct->indnatts == 1 &&
 			indexStruct->indisunique &&
 			IndexIsValid(indexStruct) &&
 			heap_attisnull(indexTuple, Anum_pg_index_indpred) &&