Remove useless "return;" lines

alvherre · alvherre · commit 3974c4a72459 · 2019-11-28T16:48:37.000-03:00
Discussion: https://postgr.es/m/20191128144653.GA27883@alvherre.pgsql
diff --git a/contrib/fuzzystrmatch/fuzzystrmatch.c b/contrib/fuzzystrmatch/fuzzystrmatch.c
@@ -698,8 +698,6 @@ _metaphone(char *word,			/* IN */
 	}							/* END FOR */
 
 	End_Phoned_Word;
-
-	return;
 }								/* END metaphone */
 
 
diff --git a/contrib/ltree/ltxtquery_io.c b/contrib/ltree/ltxtquery_io.c
@@ -192,7 +192,6 @@ pushval_asis(QPRS_STATE *state, int type, char *strval, int lenval, uint16 flag)
 	*(state->curop) = '\0';
 	state->curop++;
 	state->sumlen += lenval + 1;
-	return;
 }
 
 #define STACKDEPTH		32
diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c
@@ -545,7 +545,6 @@ CheckForExternalTrigger(void)
 
 	fprintf(stderr, "WARNING: invalid content in \"%s\"\n", triggerPath);
 	fflush(stderr);
-	return;
 }
 
 /*
diff --git a/contrib/pgcrypto/mbuf.c b/contrib/pgcrypto/mbuf.c
@@ -94,8 +94,6 @@ prepare_room(MBuf *mbuf, int block_len)
 	mbuf->data_end = newbuf + (mbuf->data_end - mbuf->data);
 	mbuf->read_pos = newbuf + (mbuf->read_pos - mbuf->data);
 	mbuf->data = newbuf;
-
-	return;
 }
 
 int
diff --git a/contrib/seg/seg.c b/contrib/seg/seg.c
@@ -706,8 +706,6 @@ rt_seg_size(SEG *a, float *size)
 		*size = 0.0;
 	else
 		*size = (float) Abs(a->upper - a->lower);
-
-	return;
 }
 
 Datum
diff --git a/contrib/sepgsql/selinux.c b/contrib/sepgsql/selinux.c
@@ -809,8 +809,6 @@ sepgsql_compute_avd(const char *scontext,
 		if (avd_ex.auditdeny & av_code_ex)
 			avd->auditdeny |= av_code;
 	}
-
-	return;
 }
 
 /*
diff --git a/src/backend/access/gist/gist.c b/src/backend/access/gist/gist.c
@@ -1088,8 +1088,6 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child)
 		LockBuffer(child->parent->buffer, GIST_EXCLUSIVE);
 		gistFindCorrectParent(r, child);
 	}
-
-	return;
 }
 
 /*
diff --git a/src/backend/access/rmgrdesc/genericdesc.c b/src/backend/access/rmgrdesc/genericdesc.c
@@ -43,8 +43,6 @@ generic_desc(StringInfo buf, XLogReaderState *record)
 		else
 			appendStringInfo(buf, "offset %u, length %u", offset, length);
 	}
-
-	return;
 }
 
 /*
diff --git a/src/backend/access/transam/twophase.c b/src/backend/access/transam/twophase.c
@@ -2436,6 +2436,4 @@ PrepareRedoRemove(TransactionId xid, bool giveWarning)
 	if (gxact->ondisk)
 		RemoveTwoPhaseFile(xid, giveWarning);
 	RemoveGXact(gxact);
-
-	return;
 }
diff --git a/src/backend/access/transam/xact.c b/src/backend/access/transam/xact.c
@@ -3428,7 +3428,6 @@ CheckTransactionBlock(bool isTopLevel, bool throwError, const char *stmtType)
 	/* translator: %s represents an SQL statement name */
 			 errmsg("%s can only be used in transaction blocks",
 					stmtType)));
-	return;
 }
 
 /*
diff --git a/src/backend/executor/nodeTableFuncscan.c b/src/backend/executor/nodeTableFuncscan.c
@@ -335,8 +335,6 @@ tfuncFetchRows(TableFuncScanState *tstate, ExprContext *econtext)
 
 	MemoryContextSwitchTo(oldcxt);
 	MemoryContextReset(tstate->perTableCxt);
-
-	return;
 }
 
 /*
diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
@@ -834,8 +834,6 @@ llvm_create_types(void)
 	 * Leave the module alive, otherwise references to function would be
 	 * dangling.
 	 */
-
-	return;
 }
 
 /*
diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
@@ -2903,7 +2903,6 @@ check_ident_usermap(IdentLine *identLine, const char *usermap_name,
 				*found_p = true;
 		}
 	}
-	return;
 }
 
 
diff --git a/src/backend/replication/logical/launcher.c b/src/backend/replication/logical/launcher.c
@@ -223,8 +223,6 @@ WaitForReplicationWorkerAttach(LogicalRepWorker *worker,
 			CHECK_FOR_INTERRUPTS();
 		}
 	}
-
-	return;
 }
 
 /*
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c
@@ -2301,7 +2301,6 @@ WalSndLoop(WalSndSendDataCallback send_data)
 									 WAIT_EVENT_WAL_SENDER_MAIN);
 		}
 	}
-	return;
 }
 
 /* Initialize a per-walsender data structure for this walsender process */
@@ -2757,8 +2756,6 @@ XLogSendPhysical(void)
 				 (uint32) (sentPtr >> 32), (uint32) sentPtr);
 		set_ps_display(activitymsg, false);
 	}
-
-	return;
 }
 
 /*
diff --git a/src/backend/rewrite/rowsecurity.c b/src/backend/rewrite/rowsecurity.c
@@ -394,8 +394,6 @@ get_row_security_policies(Query *root, RangeTblEntry *rte, int rt_index,
 	 * when necessary (eg: role changes)
 	 */
 	*hasRowSecurity = true;
-
-	return;
 }
 
 /*
diff --git a/src/backend/utils/adt/datetime.c b/src/backend/utils/adt/datetime.c
@@ -313,8 +313,6 @@ j2date(int jd, int *year, int *month, int *day)
 	quad = julian * 2141 / 65536;
 	*day = julian - 7834 * quad / 256;
 	*month = (quad + 10) % MONTHS_PER_YEAR + 1;
-
-	return;
 }								/* j2date() */
 
 
diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
@@ -422,8 +422,6 @@ free_readfile(char **optlines)
 		free(curr_line);
 
 	free(optlines);
-
-	return;
 }
 
 /*
diff --git a/src/bin/pg_dump/compress_io.c b/src/bin/pg_dump/compress_io.c
@@ -192,7 +192,6 @@ WriteDataToArchive(ArchiveHandle *AH, CompressorState *cs,
 			WriteDataToArchiveNone(AH, cs, data, dLen);
 			break;
 	}
-	return;
 }
 
 /*
@@ -308,8 +307,6 @@ WriteDataToArchiveZlib(ArchiveHandle *AH, CompressorState *cs,
 	cs->zp->next_in = (void *) unconstify(char *, data);
 	cs->zp->avail_in = dLen;
 	DeflateCompressorZlib(AH, cs, false);
-
-	return;
 }
 
 static void
@@ -407,7 +404,6 @@ WriteDataToArchiveNone(ArchiveHandle *AH, CompressorState *cs,
 					   const char *data, size_t dLen)
 {
 	cs->writeF(AH, data, dLen);
-	return;
 }
 
 
diff --git a/src/bin/pg_dump/pg_backup_archiver.c b/src/bin/pg_dump/pg_backup_archiver.c
@@ -1045,8 +1045,6 @@ WriteData(Archive *AHX, const void *data, size_t dLen)
 		fatal("internal error -- WriteData cannot be called outside the context of a DataDumper routine");
 
 	AH->WriteDataPtr(AH, data, dLen);
-
-	return;
 }
 
 /*
@@ -1461,7 +1459,6 @@ void
 archputs(const char *s, Archive *AH)
 {
 	WriteData(AH, s, strlen(s));
-	return;
 }
 
 /* Public */
@@ -1736,8 +1733,6 @@ ahwrite(const void *ptr, size_t size, size_t nmemb, ArchiveHandle *AH)
 
 	if (bytes_written != size * nmemb)
 		WRITE_ERROR_EXIT;
-
-	return;
 }
 
 /* on some error, we may decide to go on... */
diff --git a/src/bin/pg_dump/pg_backup_custom.c b/src/bin/pg_dump/pg_backup_custom.c
@@ -317,8 +317,6 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen)
 	if (dLen > 0)
 		/* WriteDataToArchive() internally throws write errors */
 		WriteDataToArchive(AH, cs, data, dLen);
-
-	return;
 }
 
 /*
@@ -644,8 +642,6 @@ _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len)
 	if (fwrite(buf, 1, len, AH->FH) != len)
 		WRITE_ERROR_EXIT;
 	ctx->filePos += len;
-
-	return;
 }
 
 /*
@@ -663,8 +659,6 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len)
 	if (fread(buf, 1, len, AH->FH) != len)
 		READ_ERROR_EXIT(AH->FH);
 	ctx->filePos += len;
-
-	return;
 }
 
 /*
@@ -945,7 +939,6 @@ _CustomWriteFunc(ArchiveHandle *AH, const char *buf, size_t len)
 		WriteInt(AH, len);
 		_WriteBuf(AH, buf, len);
 	}
-	return;
 }
 
 /*
diff --git a/src/bin/pg_dump/pg_backup_directory.c b/src/bin/pg_dump/pg_backup_directory.c
@@ -349,9 +349,6 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen)
 	if (dLen > 0 && cfwrite(data, dLen, ctx->dataFH) != dLen)
 		fatal("could not write to output file: %s",
 			  get_cfp_error(ctx->dataFH));
-
-
-	return;
 }
 
 /*
@@ -517,8 +514,6 @@ _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len)
 	if (cfwrite(buf, len, ctx->dataFH) != len)
 		fatal("could not write to output file: %s",
 			  get_cfp_error(ctx->dataFH));
-
-	return;
 }
 
 /*
@@ -537,8 +532,6 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len)
 	 */
 	if (cfread(buf, len, ctx->dataFH) != len)
 		fatal("could not read from input file: end of file");
-
-	return;
 }
 
 /*
diff --git a/src/bin/pg_dump/pg_backup_null.c b/src/bin/pg_dump/pg_backup_null.c
@@ -86,7 +86,6 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen)
 {
 	/* Just send it to output, ahwrite() already errors on failure */
 	ahwrite(data, 1, dLen, AH);
-	return;
 }
 
 /*
@@ -109,7 +108,6 @@ _WriteBlobData(ArchiveHandle *AH, const void *data, size_t dLen)
 
 		destroyPQExpBuffer(buf);
 	}
-	return;
 }
 
 static void
@@ -221,7 +219,6 @@ static void
 _WriteBuf(ArchiveHandle *AH, const void *buf, size_t len)
 {
 	/* Don't do anything */
-	return;
 }
 
 static void
diff --git a/src/bin/pg_dump/pg_backup_tar.c b/src/bin/pg_dump/pg_backup_tar.c
@@ -615,8 +615,6 @@ _WriteData(ArchiveHandle *AH, const void *data, size_t dLen)
 
 	if (tarWrite(data, dLen, tctx->TH) != dLen)
 		WRITE_ERROR_EXIT;
-
-	return;
 }
 
 static void
@@ -818,7 +816,6 @@ _ReadBuf(ArchiveHandle *AH, void *buf, size_t len)
 		fatal("could not read from input file: end of file");
 
 	ctx->filePos += len;
-	return;
 }
 
 static void
diff --git a/src/bin/pg_dump/pg_dump.c b/src/bin/pg_dump/pg_dump.c
@@ -15416,8 +15416,6 @@ dumpTable(Archive *fout, TableInfo *tbinfo)
 	}
 
 	free(namecopy);
-
-	return;
 }
 
 /*
diff --git a/src/bin/pg_upgrade/parallel.c b/src/bin/pg_upgrade/parallel.c
@@ -148,8 +148,6 @@ parallel_exec_prog(const char *log_file, const char *opt_log_file,
 		thread_handles[parallel_jobs - 1] = child;
 #endif
 	}
-
-	return;
 }
 
 
@@ -263,8 +261,6 @@ parallel_transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
 		thread_handles[parallel_jobs - 1] = child;
 #endif
 	}
-
-	return;
 }
 
 
diff --git a/src/bin/pg_upgrade/relfilenode.c b/src/bin/pg_upgrade/relfilenode.c
@@ -73,8 +73,6 @@ transfer_all_new_tablespaces(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
 
 	end_progress_output();
 	check_ok();
-
-	return;
 }
 
 
@@ -128,8 +126,6 @@ transfer_all_new_dbs(DbInfoArr *old_db_arr, DbInfoArr *new_db_arr,
 		/* We allocate something even for n_maps == 0 */
 		pg_free(mappings);
 	}
-
-	return;
 }
 
 /*
diff --git a/src/bin/pg_upgrade/tablespace.c b/src/bin/pg_upgrade/tablespace.c
@@ -100,8 +100,6 @@ get_tablespace_paths(void)
 	PQclear(res);
 
 	PQfinish(conn);
-
-	return;
 }
 
 
diff --git a/src/bin/psql/common.c b/src/bin/psql/common.c
@@ -2399,8 +2399,6 @@ expand_tilde(char **filename)
 		}
 	}
 #endif
-
-	return;
 }
 
 /*
diff --git a/src/fe_utils/print.c b/src/fe_utils/print.c
@@ -3619,8 +3619,6 @@ refresh_utf8format(const printTableOpt *opt)
 	popt->wrap_left = unicode_style.wrap_left;
 	popt->wrap_right = unicode_style.wrap_right;
 	popt->wrap_right_border = unicode_style.wrap_right_border;
-
-	return;
 }
 
 /*
diff --git a/src/interfaces/ecpg/compatlib/informix.c b/src/interfaces/ecpg/compatlib/informix.c
diff --git a/src/interfaces/ecpg/pgtypeslib/datetime.c b/src/interfaces/ecpg/pgtypeslib/datetime.c
diff --git a/src/interfaces/ecpg/pgtypeslib/dt_common.c b/src/interfaces/ecpg/pgtypeslib/dt_common.c
diff --git a/src/interfaces/ecpg/pgtypeslib/timestamp.c b/src/interfaces/ecpg/pgtypeslib/timestamp.c
diff --git a/src/interfaces/libpq/fe-auth-scram.c b/src/interfaces/libpq/fe-auth-scram.c
diff --git a/src/pl/plperl/plperl.c b/src/pl/plperl/plperl.c
diff --git a/src/pl/plpgsql/src/pl_exec.c b/src/pl/plpgsql/src/pl_exec.c
diff --git a/src/port/win32error.c b/src/port/win32error.c
diff --git a/src/test/examples/testlo.c b/src/test/examples/testlo.c
diff --git a/src/test/examples/testlo64.c b/src/test/examples/testlo64.c

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,6 @@ pushval_asis(QPRS_STATE state, int type, char strval, int lenval, uint16 flag)`
`192`	`192`	`*(state->curop) = '\0';`
`193`	`193`	`state->curop++;`
`194`	`194`	`state->sumlen += lenval + 1;`
`195`		`- return;`
`196`	`195`	`}`
`197`	`196`
`198`	`197`	`#define STACKDEPTH 32`
Original file line number	Diff line number	Diff line change
`@@ -545,7 +545,6 @@ CheckForExternalTrigger(void)`
`545`	`545`
`546`	`546`	`fprintf(stderr, "WARNING: invalid content in \"%s\"\n", triggerPath);`
`547`	`547`	`fflush(stderr);`
`548`		`- return;`
`549`	`548`	`}`
`550`	`549`
`551`	`550`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -94,8 +94,6 @@ prepare_room(MBuf *mbuf, int block_len)`
`94`	`94`	`mbuf->data_end = newbuf + (mbuf->data_end - mbuf->data);`
`95`	`95`	`mbuf->read_pos = newbuf + (mbuf->read_pos - mbuf->data);`
`96`	`96`	`mbuf->data = newbuf;`
`97`		`-`
`98`		`- return;`
`99`	`97`	`}`
`100`	`98`
`101`	`99`	`int`
Original file line number	Diff line number	Diff line change
`@@ -706,8 +706,6 @@ rt_seg_size(SEG a, float size)`
`706`	`706`	`*size = 0.0;`
`707`	`707`	`else`
`708`	`708`	`*size = (float) Abs(a->upper - a->lower);`
`709`		`-`
`710`		`- return;`
`711`	`709`	`}`
`712`	`710`
`713`	`711`	`Datum`
Original file line number	Diff line number	Diff line change
`@@ -809,8 +809,6 @@ sepgsql_compute_avd(const char *scontext,`
`809`	`809`	`if (avd_ex.auditdeny & av_code_ex)`
`810`	`810`	`avd->auditdeny \|= av_code;`
`811`	`811`	`}`
`812`		`-`
`813`		`- return;`
`814`	`812`	`}`
`815`	`813`
`816`	`814`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -1088,8 +1088,6 @@ gistFindCorrectParent(Relation r, GISTInsertStack *child)`
`1088`	`1088`	`LockBuffer(child->parent->buffer, GIST_EXCLUSIVE);`
`1089`	`1089`	`gistFindCorrectParent(r, child);`
`1090`	`1090`	`}`
`1091`		`-`
`1092`		`- return;`
`1093`	`1091`	`}`
`1094`	`1092`
`1095`	`1093`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,6 @@ generic_desc(StringInfo buf, XLogReaderState *record)`
`43`	`43`	`else`
`44`	`44`	`appendStringInfo(buf, "offset %u, length %u", offset, length);`
`45`	`45`	`}`
`46`		`-`
`47`		`- return;`
`48`	`46`	`}`
`49`	`47`
`50`	`48`	`/*`
Original file line number	Diff line number	Diff line change
`@@ -2436,6 +2436,4 @@ PrepareRedoRemove(TransactionId xid, bool giveWarning)`
`2436`	`2436`	`if (gxact->ondisk)`
`2437`	`2437`	`RemoveTwoPhaseFile(xid, giveWarning);`
`2438`	`2438`	`RemoveGXact(gxact);`
`2439`		`-`
`2440`		`- return;`
`2441`	`2439`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3428,7 +3428,6 @@ CheckTransactionBlock(bool isTopLevel, bool throwError, const char *stmtType)`
`3428`	`3428`	`/* translator: %s represents an SQL statement name */`
`3429`	`3429`	`errmsg("%s can only be used in transaction blocks",`
`3430`	`3430`	`stmtType)));`
`3431`		`- return;`
`3432`	`3431`	`}`
`3433`	`3432`
`3434`	`3433`	`/*`