Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita601366

Browse files
Harmonize more parameter names in bulk.
Make sure that function declarations use names that exactly match thecorresponding names from function definitions in optimizer, parser,utility, libpq, and "commands" code, as well as in remaining librarycode. Do the same for all code related to frontend programs (with theexception of pg_dump/pg_dumpall related code).Like other recent commits that cleaned up function parameter names, thiscommit was written with help from clang-tidy. Later commits will handleecpg and pg_dump/pg_dumpall.Author: Peter Geoghegan <pg@bowt.ie>Reviewed-By: David Rowley <dgrowleyml@gmail.com>Discussion:https://postgr.es/m/CAH2-WznJt9CMM9KJTMjJh_zbL5hD9oX44qdJ4aqZtjFi-zA3Tg@mail.gmail.com
1 parentc3382a3 commita601366

File tree

131 files changed

+297
-293
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

131 files changed

+297
-293
lines changed

‎src/backend/backup/basebackup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ typedef struct
7474
pg_checksum_typemanifest_checksum_type;
7575
}basebackup_options;
7676

77-
staticint64sendTablespace(bbsink*sink,char*path,char*oid,boolsizeonly,
77+
staticint64sendTablespace(bbsink*sink,char*path,char*spcoid,boolsizeonly,
7878
structbackup_manifest_info*manifest);
7979
staticint64sendDir(bbsink*sink,constchar*path,intbasepathlen,boolsizeonly,
8080
List*tablespaces,boolsendtblspclinks,

‎src/backend/bootstrap/bootstrap.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -463,19 +463,19 @@ boot_openrel(char *relname)
463463
* ----------------
464464
*/
465465
void
466-
closerel(char*name)
466+
closerel(char*relname)
467467
{
468-
if (name)
468+
if (relname)
469469
{
470470
if (boot_reldesc)
471471
{
472-
if (strcmp(RelationGetRelationName(boot_reldesc),name)!=0)
472+
if (strcmp(RelationGetRelationName(boot_reldesc),relname)!=0)
473473
elog(ERROR,"close of %s when %s was expected",
474-
name,RelationGetRelationName(boot_reldesc));
474+
relname,RelationGetRelationName(boot_reldesc));
475475
}
476476
else
477477
elog(ERROR,"close of %s before any relation was opened",
478-
name);
478+
relname);
479479
}
480480

481481
if (boot_reldesc==NULL)

‎src/backend/commands/event_trigger.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ static void AlterEventTriggerOwner_internal(Relation rel,
9494
staticvoiderror_duplicate_filter_variable(constchar*defname);
9595
staticDatumfilter_list_to_array(List*filterlist);
9696
staticOidinsert_event_trigger_tuple(constchar*trigname,constchar*eventname,
97-
OidevtOwner,Oidfuncoid,List*tags);
97+
OidevtOwner,Oidfuncoid,List*taglist);
9898
staticvoidvalidate_ddl_tags(constchar*filtervar,List*taglist);
9999
staticvoidvalidate_table_rewrite_tags(constchar*filtervar,List*taglist);
100100
staticvoidEventTriggerInvoke(List*fn_oid_list,EventTriggerData*trigdata);

‎src/backend/commands/explain.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ static void show_incremental_sort_info(IncrementalSortState *incrsortstate,
111111
staticvoidshow_hash_info(HashState*hashstate,ExplainState*es);
112112
staticvoidshow_memoize_info(MemoizeState*mstate,List*ancestors,
113113
ExplainState*es);
114-
staticvoidshow_hashagg_info(AggState*hashstate,ExplainState*es);
114+
staticvoidshow_hashagg_info(AggState*aggstate,ExplainState*es);
115115
staticvoidshow_tidbitmap_info(BitmapHeapScanState*planstate,
116116
ExplainState*es);
117117
staticvoidshow_instrumentation_count(constchar*qlabel,intwhich,

‎src/backend/commands/indexcmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ static OidReindexTable(RangeVar *relation, ReindexParams *params,
9898
boolisTopLevel);
9999
staticvoidReindexMultipleTables(constchar*objectName,
100100
ReindexObjectTypeobjectKind,ReindexParams*params);
101-
staticvoidreindex_error_callback(void*args);
101+
staticvoidreindex_error_callback(void*arg);
102102
staticvoidReindexPartitions(Oidrelid,ReindexParams*params,
103103
boolisTopLevel);
104104
staticvoidReindexMultipleInternal(List*relids,

‎src/backend/commands/lockcmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
#include"utils/syscache.h"
3030

3131
staticvoidLockTableRecurse(Oidreloid,LOCKMODElockmode,boolnowait);
32-
staticAclResultLockTableAclCheck(Oidrelid,LOCKMODElockmode,Oiduserid);
32+
staticAclResultLockTableAclCheck(Oidreloid,LOCKMODElockmode,Oiduserid);
3333
staticvoidRangeVarCallbackForLockTable(constRangeVar*rv,Oidrelid,
3434
Oidoldrelid,void*arg);
3535
staticvoidLockViewRecurse(Oidreloid,LOCKMODElockmode,boolnowait,

‎src/backend/commands/opclasscmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
staticvoidAlterOpFamilyAdd(AlterOpFamilyStmt*stmt,
5353
Oidamoid,Oidopfamilyoid,
5454
intmaxOpNumber,intmaxProcNumber,
55-
intopclassOptsProcNumber,List*items);
55+
intoptsProcNumber,List*items);
5656
staticvoidAlterOpFamilyDrop(AlterOpFamilyStmt*stmt,
5757
Oidamoid,Oidopfamilyoid,
5858
intmaxOpNumber,intmaxProcNumber,

‎src/backend/commands/schemacmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -285,16 +285,16 @@ RenameSchema(const char *oldname, const char *newname)
285285
}
286286

287287
void
288-
AlterSchemaOwner_oid(Oidoid,OidnewOwnerId)
288+
AlterSchemaOwner_oid(Oidschemaoid,OidnewOwnerId)
289289
{
290290
HeapTupletup;
291291
Relationrel;
292292

293293
rel=table_open(NamespaceRelationId,RowExclusiveLock);
294294

295-
tup=SearchSysCache1(NAMESPACEOID,ObjectIdGetDatum(oid));
295+
tup=SearchSysCache1(NAMESPACEOID,ObjectIdGetDatum(schemaoid));
296296
if (!HeapTupleIsValid(tup))
297-
elog(ERROR,"cache lookup failed for schema %u",oid);
297+
elog(ERROR,"cache lookup failed for schema %u",schemaoid);
298298

299299
AlterSchemaOwner_internal(tup,rel,newOwnerId);
300300

‎src/backend/commands/tablecmds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -550,7 +550,7 @@ static ObjectAddress ATExecAlterColumnType(AlteredTableInfo *tab, Relation rel,
550550
AlterTableCmd *cmd, LOCKMODE lockmode);
551551
static void RememberConstraintForRebuilding(Oid conoid, AlteredTableInfo *tab);
552552
static void RememberIndexForRebuilding(Oid indoid, AlteredTableInfo *tab);
553-
static void RememberStatisticsForRebuilding(Oidindoid, AlteredTableInfo *tab);
553+
static void RememberStatisticsForRebuilding(Oidstxoid, AlteredTableInfo *tab);
554554
static void ATPostAlterTypeCleanup(List **wqueue, AlteredTableInfo *tab,
555555
LOCKMODE lockmode);
556556
static void ATPostAlterTypeParse(Oid oldId, Oid oldRelId, Oid refRelId,
@@ -610,7 +610,7 @@ static void ComputePartitionAttrs(ParseState *pstate, Relation rel, List *partPa
610610
List **partexprs, Oid *partopclass, Oid *partcollation, char strategy);
611611
static void CreateInheritance(Relation child_rel, Relation parent_rel);
612612
static void RemoveInheritance(Relation child_rel, Relation parent_rel,
613-
boolallow_detached);
613+
boolexpect_detached);
614614
static ObjectAddress ATExecAttachPartition(List **wqueue, Relation rel,
615615
PartitionCmd *cmd,
616616
AlterTableUtilityContext *context);
@@ -627,7 +627,7 @@ static ObjectAddress ATExecDetachPartition(List **wqueue, AlteredTableInfo *tab,
627627
static void DetachPartitionFinalize(Relation rel, Relation partRel,
628628
bool concurrent, Oid defaultPartOid);
629629
static ObjectAddress ATExecDetachPartitionFinalize(Relation rel, RangeVar *name);
630-
static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, Relationrel,
630+
static ObjectAddress ATExecAttachPartitionIdx(List **wqueue, RelationparentIdx,
631631
RangeVar *name);
632632
static void validatePartitionedIndex(Relation partedIdx, Relation partedTbl);
633633
static void refuseDupeIndexAttach(Relation parentIdx, Relation partIdx,

‎src/backend/commands/trigger.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,8 +86,8 @@ static bool GetTupleForTrigger(EState *estate,
8686
ItemPointertid,
8787
LockTupleModelockmode,
8888
TupleTableSlot*oldslot,
89-
TupleTableSlot**newSlot,
90-
TM_FailureData*tmfpd);
89+
TupleTableSlot**epqslot,
90+
TM_FailureData*tmfdp);
9191
staticboolTriggerEnabled(EState*estate,ResultRelInfo*relinfo,
9292
Trigger*trigger,TriggerEventevent,
9393
Bitmapset*modifiedCols,
@@ -101,7 +101,7 @@ static void AfterTriggerSaveEvent(EState *estate, ResultRelInfo *relinfo,
101101
ResultRelInfo*src_partinfo,
102102
ResultRelInfo*dst_partinfo,
103103
intevent,boolrow_trigger,
104-
TupleTableSlot*oldtup,TupleTableSlot*newtup,
104+
TupleTableSlot*oldslot,TupleTableSlot*newslot,
105105
List*recheckIndexes,Bitmapset*modifiedCols,
106106
TransitionCaptureState*transition_capture,
107107
boolis_crosspart_update);
@@ -3871,7 +3871,7 @@ static void TransitionTableAddTuple(EState *estate,
38713871
Tuplestorestate*tuplestore);
38723872
staticvoidAfterTriggerFreeQuery(AfterTriggersQueryData*qs);
38733873
staticSetConstraintStateSetConstraintStateCreate(intnumalloc);
3874-
staticSetConstraintStateSetConstraintStateCopy(SetConstraintStatestate);
3874+
staticSetConstraintStateSetConstraintStateCopy(SetConstraintStateorigstate);
38753875
staticSetConstraintStateSetConstraintStateAddItem(SetConstraintStatestate,
38763876
Oidtgoid,booltgisdeferred);
38773877
staticvoidcancel_prior_stmt_triggers(Oidrelid,CmdTypecmdType,inttgevent);

‎src/backend/lib/dshash.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ struct dshash_table
167167

168168
staticvoiddelete_item(dshash_table*hash_table,
169169
dshash_table_item*item);
170-
staticvoidresize(dshash_table*hash_table,size_tnew_size);
170+
staticvoidresize(dshash_table*hash_table,size_tnew_size_log2);
171171
staticinlinevoidensure_valid_bucket_pointers(dshash_table*hash_table);
172172
staticinlinedshash_table_item*find_in_bucket(dshash_table*hash_table,
173173
constvoid*key,

‎src/backend/lib/integerset.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -264,9 +264,9 @@ static void intset_update_upper(IntegerSet *intset, int level,
264264
intset_node*child,uint64child_key);
265265
staticvoidintset_flush_buffered_values(IntegerSet*intset);
266266

267-
staticintintset_binsrch_uint64(uint64value,uint64*arr,intarr_elems,
267+
staticintintset_binsrch_uint64(uint64item,uint64*arr,intarr_elems,
268268
boolnextkey);
269-
staticintintset_binsrch_leaf(uint64value,leaf_item*arr,intarr_elems,
269+
staticintintset_binsrch_leaf(uint64item,leaf_item*arr,intarr_elems,
270270
boolnextkey);
271271

272272
staticuint64simple8b_encode(constuint64*ints,int*num_encoded,uint64base);

‎src/backend/libpq/be-secure-openssl.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,10 @@ static BIO_METHOD *my_BIO_s_socket(void);
6262
staticintmy_SSL_set_fd(Port*port,intfd);
6363

6464
staticDH*load_dh_file(char*filename,boolisServerStart);
65-
staticDH*load_dh_buffer(constchar*,size_t);
65+
staticDH*load_dh_buffer(constchar*buffer,size_tlen);
6666
staticintssl_external_passwd_cb(char*buf,intsize,intrwflag,void*userdata);
6767
staticintdummy_ssl_passwd_cb(char*buf,intsize,intrwflag,void*userdata);
68-
staticintverify_cb(int,X509_STORE_CTX*);
68+
staticintverify_cb(intok,X509_STORE_CTX*ctx);
6969
staticvoidinfo_cb(constSSL*ssl,inttype,intargs);
7070
staticboolinitialize_dh(SSL_CTX*context,boolisServerStart);
7171
staticboolinitialize_ecdh(SSL_CTX*context,boolisServerStart);

‎src/backend/optimizer/geqo/geqo_selection.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include"optimizer/geqo_random.h"
4343
#include"optimizer/geqo_selection.h"
4444

45-
staticintlinear_rand(PlannerInfo*root,intmax,doublebias);
45+
staticintlinear_rand(PlannerInfo*root,intpool_size,doublebias);
4646

4747

4848
/*

‎src/backend/optimizer/plan/createplan.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ static ModifyTable *make_modifytable(PlannerInfo *root, Plan *subplan,
311311
List*updateColnosLists,
312312
List*withCheckOptionLists,List*returningLists,
313313
List*rowMarks,OnConflictExpr*onconflict,
314-
List*mergeActionList,intepqParam);
314+
List*mergeActionLists,intepqParam);
315315
staticGatherMerge*create_gather_merge_plan(PlannerInfo*root,
316316
GatherMergePath*best_path);
317317

‎src/backend/optimizer/plan/planner.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3086,13 +3086,13 @@ extract_rollup_sets(List *groupingSets)
30863086
* gets implemented in one pass.)
30873087
*/
30883088
staticList*
3089-
reorder_grouping_sets(List*groupingsets,List*sortclause)
3089+
reorder_grouping_sets(List*groupingSets,List*sortclause)
30903090
{
30913091
ListCell*lc;
30923092
List*previous=NIL;
30933093
List*result=NIL;
30943094

3095-
foreach(lc,groupingsets)
3095+
foreach(lc,groupingSets)
30963096
{
30973097
List*candidate= (List*)lfirst(lc);
30983098
List*new_elems=list_difference_int(candidate,previous);

‎src/backend/optimizer/util/plancat.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,8 @@ static List *build_index_tlist(PlannerInfo *root, IndexOptInfo *index,
7575
staticList*get_relation_statistics(RelOptInfo*rel,Relationrelation);
7676
staticvoidset_relation_partition_info(PlannerInfo*root,RelOptInfo*rel,
7777
Relationrelation);
78-
staticPartitionSchemefind_partition_scheme(PlannerInfo*root,Relationrel);
78+
staticPartitionSchemefind_partition_scheme(PlannerInfo*root,
79+
Relationrelation);
7980
staticvoidset_baserel_partition_key_exprs(Relationrelation,
8081
RelOptInfo*rel);
8182
staticvoidset_baserel_partition_constraint(Relationrelation,

‎src/backend/parser/gram.y

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -205,8 +205,7 @@ static Node *makeXmlExpr(XmlExprOp op, char *name, List *named_args,
205205
static List *mergeTableFuncParameters(List *func_args, List *columns);
206206
static TypeName *TableFuncTypeName(List *columns);
207207
static RangeVar *makeRangeVarFromAnyName(List *names,int position,core_yyscan_t yyscanner);
208-
static RangeVar *makeRangeVarFromQualifiedName(char *name, List *rels,
209-
int location,
208+
static RangeVar *makeRangeVarFromQualifiedName(char *name, List *namelist,int location,
210209
core_yyscan_t yyscanner);
211210
staticvoidSplitColQualList(List *qualList,
212211
List **constraintList, CollateClause **collClause,

‎src/backend/parser/parse_clause.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ static ParseNamespaceItem *transformRangeSubselect(ParseState *pstate,
6767
staticParseNamespaceItem*transformRangeFunction(ParseState*pstate,
6868
RangeFunction*r);
6969
staticParseNamespaceItem*transformRangeTableFunc(ParseState*pstate,
70-
RangeTableFunc*t);
70+
RangeTableFunc*rtf);
7171
staticTableSampleClause*transformRangeTableSample(ParseState*pstate,
7272
RangeTableSample*rts);
7373
staticParseNamespaceItem*getNSItemForSpecialRelationTypes(ParseState*pstate,

‎src/backend/parser/parse_utilcmd.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ static void transformPartitionCmd(CreateStmtContext *cxt, PartitionCmd *cmd);
139139
staticList*transformPartitionRangeBounds(ParseState*pstate,List*blist,
140140
Relationparent);
141141
staticvoidvalidateInfiniteBounds(ParseState*pstate,List*blist);
142-
staticConst*transformPartitionBoundValue(ParseState*pstate,Node*con,
142+
staticConst*transformPartitionBoundValue(ParseState*pstate,Node*val,
143143
constchar*colName,OidcolType,int32colTypmod,
144144
OidpartCollation);
145145

‎src/backend/partitioning/partbounds.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ static PartitionBoundInfo create_list_bounds(PartitionBoundSpec **boundspecs,
104104
staticPartitionBoundInfocreate_range_bounds(PartitionBoundSpec**boundspecs,
105105
intnparts,PartitionKeykey,int**mapping);
106106
staticPartitionBoundInfomerge_list_bounds(FmgrInfo*partsupfunc,
107-
Oid*collations,
107+
Oid*partcollation,
108108
RelOptInfo*outer_rel,
109109
RelOptInfo*inner_rel,
110110
JoinTypejointype,
@@ -123,8 +123,8 @@ static void free_partition_map(PartitionMap *map);
123123
staticboolis_dummy_partition(RelOptInfo*rel,intpart_index);
124124
staticintmerge_matching_partitions(PartitionMap*outer_map,
125125
PartitionMap*inner_map,
126-
intouter_part,
127-
intinner_part,
126+
intouter_index,
127+
intinner_index,
128128
int*next_index);
129129
staticintprocess_outer_partition(PartitionMap*outer_map,
130130
PartitionMap*inner_map,

‎src/backend/postmaster/postmaster.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ static void report_fork_failure_to_client(Port *port, int errnum);
414414
staticCAC_statecanAcceptConnections(intbackend_type);
415415
staticboolRandomCancelKey(int32*cancel_key);
416416
staticvoidsignal_child(pid_tpid,intsignal);
417-
staticboolSignalSomeChildren(intsignal,inttargets);
417+
staticboolSignalSomeChildren(intsignal,inttarget);
418418
staticvoidTerminateChildren(intsignal);
419419

420420
#defineSignalChildren(sig) SignalSomeChildren(sig, BACKEND_TYPE_ALL)
@@ -2598,9 +2598,9 @@ ConnCreate(int serverFd)
25982598
* to do here.
25992599
*/
26002600
staticvoid
2601-
ConnFree(Port*conn)
2601+
ConnFree(Port*port)
26022602
{
2603-
free(conn);
2603+
free(port);
26042604
}
26052605

26062606

‎src/backend/statistics/extended_stats.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ static void statext_store(Oid statOid, bool inh,
8383
MVNDistinct*ndistinct,MVDependencies*dependencies,
8484
MCVList*mcv,Datumexprs,VacAttrStats**stats);
8585
staticintstatext_compute_stattarget(intstattarget,
86-
intnatts,VacAttrStats**stats);
86+
intnattrs,VacAttrStats**stats);
8787

8888
/* Information needed to analyze a single simple expression. */
8989
typedefstructAnlExprData
@@ -99,7 +99,7 @@ static Datum serialize_expr_stats(AnlExprData *exprdata, int nexprs);
9999
staticDatumexpr_fetch_func(VacAttrStatsPstats,intrownum,bool*isNull);
100100
staticAnlExprData*build_expr_data(List*exprs,intstattarget);
101101

102-
staticStatsBuildData*make_build_data(Relationonerel,StatExtEntry*stat,
102+
staticStatsBuildData*make_build_data(Relationrel,StatExtEntry*stat,
103103
intnumrows,HeapTuple*rows,
104104
VacAttrStats**stats,intstattarget);
105105

‎src/backend/utils/adt/datetime.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include"utils/memutils.h"
3333
#include"utils/tzparser.h"
3434

35-
staticintDecodeNumber(intflen,char*field,boolhaveTextMonth,
35+
staticintDecodeNumber(intflen,char*str,boolhaveTextMonth,
3636
intfmask,int*tmask,
3737
structpg_tm*tm,fsec_t*fsec,bool*is2digits);
3838
staticintDecodeNumberField(intlen,char*str,
@@ -281,26 +281,26 @@ static const datetkn *abbrevcache[MAXDATEFIELDS] = {NULL};
281281
*/
282282

283283
int
284-
date2j(inty,intm,intd)
284+
date2j(intyear,intmonth,intday)
285285
{
286286
intjulian;
287287
intcentury;
288288

289-
if (m>2)
289+
if (month>2)
290290
{
291-
m+=1;
292-
y+=4800;
291+
month+=1;
292+
year+=4800;
293293
}
294294
else
295295
{
296-
m+=13;
297-
y+=4799;
296+
month+=13;
297+
year+=4799;
298298
}
299299

300-
century=y /100;
301-
julian=y*365-32167;
302-
julian+=y /4-century+century /4;
303-
julian+=7834*m /256+d;
300+
century=year /100;
301+
julian=year*365-32167;
302+
julian+=year /4-century+century /4;
303+
julian+=7834*month /256+day;
304304

305305
returnjulian;
306306
}/* date2j() */

‎src/backend/utils/adt/geo_ops.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,16 +90,16 @@ static inline float8 line_sl(LINE *line);
9090
static inline float8 line_invsl(LINE *line);
9191
static bool line_interpt_line(Point *result, LINE *l1, LINE *l2);
9292
static bool line_contain_point(LINE *line, Point *point);
93-
static float8 line_closept_point(Point *result, LINE *line, Point *pt);
93+
static float8 line_closept_point(Point *result, LINE *line, Point *point);
9494

9595
/* Routines for line segments */
9696
static inline void statlseg_construct(LSEG *lseg, Point *pt1, Point *pt2);
9797
static inline float8 lseg_sl(LSEG *lseg);
9898
static inline float8 lseg_invsl(LSEG *lseg);
9999
static bool lseg_interpt_line(Point *result, LSEG *lseg, LINE *line);
100100
static bool lseg_interpt_lseg(Point *result, LSEG *l1, LSEG *l2);
101-
static intlseg_crossing(float8 x, float8 y, float8px, float8py);
102-
static bool lseg_contain_point(LSEG *lseg, Point *point);
101+
static intlseg_crossing(float8 x, float8 y, float8prev_x, float8prev_y);
102+
static bool lseg_contain_point(LSEG *lseg, Point *pt);
103103
static float8 lseg_closept_point(Point *result, LSEG *lseg, Point *pt);
104104
static float8 lseg_closept_line(Point *result, LSEG *lseg, LINE *line);
105105
static float8 lseg_closept_lseg(Point *result, LSEG *on_lseg, LSEG *to_lseg);
@@ -115,7 +115,7 @@ static bool box_contain_point(BOX *box, Point *point);
115115
static bool box_contain_box(BOX *contains_box, BOX *contained_box);
116116
static bool box_contain_lseg(BOX *box, LSEG *lseg);
117117
static bool box_interpt_lseg(Point *result, BOX *box, LSEG *lseg);
118-
static float8 box_closept_point(Point *result, BOX *box, Point *point);
118+
static float8 box_closept_point(Point *result, BOX *box, Point *pt);
119119
static float8 box_closept_lseg(Point *result, BOX *box, LSEG *lseg);
120120

121121
/* Routines for circles */

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp