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

Commitfa27dd4

Browse files
committed
Run pgindent with new pg_bsd_indent version 2.1.1.
Thomas Munro fixed a longstanding annoyance in pg_bsd_indent, thatit would misformat lines containing IsA() macros on the assumptionthat the IsA() call should be treated like a cast. This improvessome other cases involving field/variable names that match typedefs,too. The only places that get worse are a couple of uses of theOpenSSL macro STACK_OF(); we'll gladly take that trade-off.Discussion:https://postgr.es/m/20200114221814.GA19630@alvherre.pgsql
1 parente02ad57 commitfa27dd4

File tree

33 files changed

+47
-47
lines changed

33 files changed

+47
-47
lines changed

‎src/backend/commands/explain.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ ExplainPrintPlan(ExplainState *es, QueryDesc *queryDesc)
753753
* further down in the plan tree.
754754
*/
755755
ps=queryDesc->planstate;
756-
if (IsA(ps,GatherState)&&((Gather*)ps->plan)->invisible)
756+
if (IsA(ps,GatherState)&&((Gather*)ps->plan)->invisible)
757757
{
758758
ps=outerPlanState(ps);
759759
es->hide_workers= true;
@@ -2256,7 +2256,7 @@ show_scan_qual(List *qual, const char *qlabel,
22562256
{
22572257
booluseprefix;
22582258

2259-
useprefix= (IsA(planstate->plan,SubqueryScan)||es->verbose);
2259+
useprefix= (IsA(planstate->plan,SubqueryScan)||es->verbose);
22602260
show_qual(qual,qlabel,planstate,ancestors,useprefix,es);
22612261
}
22622262

‎src/backend/commands/tablecmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11136,7 +11136,7 @@ ATColumnChangeRequiresRewrite(Node *expr, AttrNumber varattno)
1113611136
for (;;)
1113711137
{
1113811138
/* only one varno, so no need to check that */
11139-
if (IsA(expr, Var) &&((Var *) expr)->varattno == varattno)
11139+
if (IsA(expr, Var) &&((Var *) expr)->varattno == varattno)
1114011140
return false;
1114111141
else if (IsA(expr, RelabelType))
1114211142
expr = (Node *) ((RelabelType *) expr)->arg;

‎src/backend/commands/typecmds.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2176,7 +2176,7 @@ AlterDomainDefault(List *names, Node *defaultRaw)
21762176
* DefineDomain.)
21772177
*/
21782178
if (defaultExpr==NULL||
2179-
(IsA(defaultExpr,Const)&&((Const*)defaultExpr)->constisnull))
2179+
(IsA(defaultExpr,Const)&&((Const*)defaultExpr)->constisnull))
21802180
{
21812181
/* Default is NULL, drop it */
21822182
defaultExpr=NULL;

‎src/backend/executor/nodeAgg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1410,7 +1410,7 @@ find_unaggregated_cols_walker(Node *node, Bitmapset **colnos)
14101410
*colnos=bms_add_member(*colnos,var->varattno);
14111411
return false;
14121412
}
1413-
if (IsA(node,Aggref)||IsA(node,GroupingFunc))
1413+
if (IsA(node,Aggref)||IsA(node,GroupingFunc))
14141414
{
14151415
/* do not descend into aggregate exprs */
14161416
return false;

‎src/backend/executor/nodeProjectSet.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -277,8 +277,8 @@ ExecInitProjectSet(ProjectSet *node, EState *estate, int eflags)
277277
TargetEntry*te= (TargetEntry*)lfirst(lc);
278278
Expr*expr=te->expr;
279279

280-
if ((IsA(expr,FuncExpr)&&((FuncExpr*)expr)->funcretset)||
281-
(IsA(expr,OpExpr)&&((OpExpr*)expr)->opretset))
280+
if ((IsA(expr,FuncExpr)&&((FuncExpr*)expr)->funcretset)||
281+
(IsA(expr,OpExpr)&&((OpExpr*)expr)->opretset))
282282
{
283283
state->elems[off]= (Node*)
284284
ExecInitFunctionResultSet(expr,state->ps.ps_ExprContext,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ static intssl_protocol_version_to_openssl(int v);
8080
int
8181
be_tls_init(boolisServerStart)
8282
{
83-
STACK_OF(X509_NAME)*root_cert_list=NULL;
83+
STACK_OF(X509_NAME)*root_cert_list=NULL;
8484
SSL_CTX*context;
8585
intssl_ver_min=-1;
8686
intssl_ver_max=-1;

‎src/backend/nodes/outfuncs.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3682,7 +3682,7 @@ outNode(StringInfo str, const void *obj)
36823682

36833683
if (obj==NULL)
36843684
appendStringInfoString(str,"<>");
3685-
elseif (IsA(obj,List)||IsA(obj,IntList)||IsA(obj,OidList))
3685+
elseif (IsA(obj,List)||IsA(obj,IntList)||IsA(obj,OidList))
36863686
_outList(str,obj);
36873687
elseif (IsA(obj,Integer)||
36883688
IsA(obj,Float)||

‎src/backend/optimizer/path/costsize.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3257,7 +3257,7 @@ final_cost_mergejoin(PlannerInfo *root, MergePath *path,
32573257
* The whole issue is moot if we are working from a unique-ified outer
32583258
* input, or if we know we don't need to mark/restore at all.
32593259
*/
3260-
if (IsA(outer_path,UniquePath)||path->skip_mark_restore)
3260+
if (IsA(outer_path,UniquePath)||path->skip_mark_restore)
32613261
rescannedtuples=0;
32623262
else
32633263
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1960,7 +1960,7 @@ set_upper_references(PlannerInfo *root, Plan *plan, int rtoffset)
19601960
staticvoid
19611961
set_param_references(PlannerInfo*root,Plan*plan)
19621962
{
1963-
Assert(IsA(plan,Gather)||IsA(plan,GatherMerge));
1963+
Assert(IsA(plan,Gather)||IsA(plan,GatherMerge));
19641964

19651965
if (plan->lefttree->extParam)
19661966
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2639,7 +2639,7 @@ apply_projection_to_path(PlannerInfo *root,
26392639
* workers can help project. But if there is something that is not
26402640
* parallel-safe in the target expressions, then we can't.
26412641
*/
2642-
if ((IsA(path,GatherPath)||IsA(path,GatherMergePath))&&
2642+
if ((IsA(path,GatherPath)||IsA(path,GatherMergePath))&&
26432643
is_parallel_safe(root, (Node*)target->exprs))
26442644
{
26452645
/*

‎src/backend/parser/analyze.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ transformOptionalSelectInto(ParseState *pstate, Node *parseTree)
221221
/* If it's a set-operation tree, drill down to leftmost SelectStmt */
222222
while (stmt&&stmt->op!=SETOP_NONE)
223223
stmt=stmt->larg;
224-
Assert(stmt&&IsA(stmt,SelectStmt)&&stmt->larg==NULL);
224+
Assert(stmt&&IsA(stmt,SelectStmt)&&stmt->larg==NULL);
225225

226226
if (stmt->intoClause)
227227
{
@@ -641,7 +641,7 @@ transformInsertStmt(ParseState *pstate, InsertStmt *stmt)
641641
if (tle->resjunk)
642642
continue;
643643
if (tle->expr&&
644-
(IsA(tle->expr,Const)||IsA(tle->expr,Param))&&
644+
(IsA(tle->expr,Const)||IsA(tle->expr,Param))&&
645645
exprType((Node*)tle->expr)==UNKNOWNOID)
646646
expr=tle->expr;
647647
else

‎src/backend/parser/parse_agg.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -750,8 +750,8 @@ check_agg_arguments_walker(Node *node,
750750
*/
751751
if (context->sublevels_up==0)
752752
{
753-
if ((IsA(node,FuncExpr)&&((FuncExpr*)node)->funcretset)||
754-
(IsA(node,OpExpr)&&((OpExpr*)node)->opretset))
753+
if ((IsA(node,FuncExpr)&&((FuncExpr*)node)->funcretset)||
754+
(IsA(node,OpExpr)&&((OpExpr*)node)->opretset))
755755
ereport(ERROR,
756756
(errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
757757
errmsg("aggregate function calls cannot contain set-returning function calls"),

‎src/backend/parser/parse_clause.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1767,7 +1767,7 @@ transformLimitClause(ParseState *pstate, Node *clause,
17671767
* unadorned NULL that's not accepted back by the grammar.
17681768
*/
17691769
if (exprKind==EXPR_KIND_LIMIT&&limitOption==LIMIT_OPTION_WITH_TIES&&
1770-
IsA(clause,A_Const)&&((A_Const*)clause)->val.type==T_Null)
1770+
IsA(clause,A_Const)&&((A_Const*)clause)->val.type==T_Null)
17711771
ereport(ERROR,
17721772
(errcode(ERRCODE_INVALID_ROW_COUNT_IN_LIMIT_CLAUSE),
17731773
errmsg("row count cannot be NULL in FETCH FIRST ... WITH TIES clause")));

‎src/backend/parser/parse_expr.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -961,7 +961,7 @@ transformAExprOp(ParseState *pstate, A_Expr *a)
961961
list_length(a->name)==1&&
962962
strcmp(strVal(linitial(a->name)),"=")==0&&
963963
(exprIsNullConstant(lexpr)||exprIsNullConstant(rexpr))&&
964-
(!IsA(lexpr,CaseTestExpr)&&!IsA(rexpr,CaseTestExpr)))
964+
(!IsA(lexpr,CaseTestExpr)&&!IsA(rexpr,CaseTestExpr)))
965965
{
966966
NullTest*n=makeNode(NullTest);
967967

‎src/backend/statistics/extended_stats.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1479,13 +1479,13 @@ examine_clause_args(List *args, Var **varp, Const **cstp, bool *varonleftp)
14791479
if (IsA(rightop,RelabelType))
14801480
rightop= (Node*) ((RelabelType*)rightop)->arg;
14811481

1482-
if (IsA(leftop,Var)&&IsA(rightop,Const))
1482+
if (IsA(leftop,Var)&&IsA(rightop,Const))
14831483
{
14841484
var= (Var*)leftop;
14851485
cst= (Const*)rightop;
14861486
varonleft= true;
14871487
}
1488-
elseif (IsA(leftop,Const)&&IsA(rightop,Var))
1488+
elseif (IsA(leftop,Const)&&IsA(rightop,Var))
14891489
{
14901490
var= (Var*)rightop;
14911491
cst= (Const*)leftop;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4471,7 +4471,7 @@ TemporalSimplify(int32 max_precis, Node *node)
44714471

44724472
typmod= (Node*)lsecond(expr->args);
44734473

4474-
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
4474+
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
44754475
{
44764476
Node*source= (Node*)linitial(expr->args);
44774477
int32old_precis=exprTypmod(source);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5025,7 +5025,7 @@ NUM_prepare_locale(NUMProc *Np)
50255025
if (lconv->thousands_sep&&*lconv->thousands_sep)
50265026
Np->L_thousands_sep=lconv->thousands_sep;
50275027
/* Make sure thousands separator doesn't match decimal point symbol. */
5028-
elseif (strcmp(Np->decimal,",")!=0)
5028+
elseif (strcmp(Np->decimal,",")!=0)
50295029
Np->L_thousands_sep=",";
50305030
else
50315031
Np->L_thousands_sep=".";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -911,7 +911,7 @@ numeric_support(PG_FUNCTION_ARGS)
911911

912912
typmod= (Node*)lsecond(expr->args);
913913

914-
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
914+
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
915915
{
916916
Node*source= (Node*)linitial(expr->args);
917917
int32old_typmod=exprTypmod(source);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5829,8 +5829,8 @@ get_rule_sortgroupclause(Index ref, List *tlist, bool force_colno,
58295829
*/
58305830
boolneed_paren= (PRETTY_PAREN(context)
58315831
||IsA(expr,FuncExpr)
5832-
||IsA(expr,Aggref)
5833-
||IsA(expr,WindowFunc));
5832+
||IsA(expr,Aggref)
5833+
||IsA(expr,WindowFunc));
58345834

58355835
if (need_paren)
58365836
appendStringInfoChar(context->buf,'(');
@@ -10317,7 +10317,7 @@ get_from_clause_item(Node *jtnode, Query *query, deparse_context *context)
1031710317

1031810318
need_paren_on_right=PRETTY_PAREN(context)&&
1031910319
!IsA(j->rarg,RangeTblRef)&&
10320-
!(IsA(j->rarg,JoinExpr)&&((JoinExpr*)j->rarg)->alias!=NULL);
10320+
!(IsA(j->rarg,JoinExpr)&&((JoinExpr*)j->rarg)->alias!=NULL);
1032110321

1032210322
if (!PRETTY_PAREN(context)||j->alias!=NULL)
1032310323
appendStringInfoChar(buf,'(');

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1263,7 +1263,7 @@ interval_support(PG_FUNCTION_ARGS)
12631263

12641264
typmod= (Node*)lsecond(expr->args);
12651265

1266-
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
1266+
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
12671267
{
12681268
Node*source= (Node*)linitial(expr->args);
12691269
int32new_typmod=DatumGetInt32(((Const*)typmod)->constvalue);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ varbit_support(PG_FUNCTION_ARGS)
713713

714714
typmod= (Node*)lsecond(expr->args);
715715

716-
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
716+
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
717717
{
718718
Node*source= (Node*)linitial(expr->args);
719719
int32new_typmod=DatumGetInt32(((Const*)typmod)->constvalue);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ varchar_support(PG_FUNCTION_ARGS)
572572

573573
typmod= (Node*)lsecond(expr->args);
574574

575-
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
575+
if (IsA(typmod,Const)&&!((Const*)typmod)->constisnull)
576576
{
577577
Node*source= (Node*)linitial(expr->args);
578578
int32old_typmod=exprTypmod(source);

‎src/bin/pg_dump/pg_backup_directory.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ _PrintFileData(ArchiveHandle *AH, char *filename)
396396
}
397397

398398
free(buf);
399-
if (cfclose(cfp)!=0)
399+
if (cfclose(cfp)!=0)
400400
fatal("could not close data file \"%s\": %m",filename);
401401
}
402402

‎src/bin/psql/tab-complete.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4191,7 +4191,7 @@ _complete_from_query(const char *simple_query,
41914191
*/
41924192
if (strcmp(schema_query->catname,
41934193
"pg_catalog.pg_class c") == 0 &&
4194-
strncmp(text,"pg_",3)!=0)
4194+
strncmp(text, "pg_", 3) !=0)
41954195
{
41964196
appendPQExpBufferStr(&query_buffer,
41974197
" AND c.relnamespace <> (SELECT oid FROM"

‎src/common/jsonapi.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ IsValidJsonNumber(const char *str, int len)
129129
*/
130130
if (*str == '-')
131131
{
132-
dummy_lex.input = unconstify(char *, str) +1;
132+
dummy_lex.input = unconstify(char *, str) +1;
133133
dummy_lex.input_length = len - 1;
134134
}
135135
else

‎src/interfaces/ecpg/ecpglib/execute.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ next_insert(char *text, int pos, bool questionmarks, bool std_strings)
132132
for (i = p + 1; isdigit((unsigned char) text[i]); i++)
133133
/* empty loop body */ ;
134134
if (!isalpha((unsigned char) text[i]) &&
135-
isascii((unsigned char) text[i]) &&text[i] != '_')
135+
isascii((unsigned char) text[i]) &&text[i] != '_')
136136
/* not dollar delimited quote */
137137
return p;
138138
}

‎src/interfaces/ecpg/ecpglib/prepare.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ replace_variables(char **text, int lineno)
132132

133133
for (len = 1; (*text)[ptr + len] && isvarchar((*text)[ptr + len]); len++)
134134
/* skip */ ;
135-
if (!(newcopy = (char *) ecpg_alloc(strlen(*text) -len + strlen(buffer) + 1, lineno)))
135+
if (!(newcopy = (char *) ecpg_alloc(strlen(*text) -len + strlen(buffer) + 1, lineno)))
136136
{
137137
ecpg_free(buffer);
138138
return false;

‎src/interfaces/libpq/fe-secure-openssl.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -513,7 +513,7 @@ pgtls_verify_peer_name_matches_certificate_guts(PGconn *conn,
513513
int *names_examined,
514514
char **first_name)
515515
{
516-
STACK_OF(GENERAL_NAME) *peer_san;
516+
STACK_OF(GENERAL_NAME) *peer_san;
517517
inti;
518518
intrc = 0;
519519

‎src/pl/plpgsql/src/pl_exec.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8164,8 +8164,8 @@ exec_save_simple_expr(PLpgSQL_expr *expr, CachedPlan *cplan)
81648164
if (IsA(tle_expr, Const))
81658165
break;
81668166
/* Otherwise, it had better be a Param or an outer Var */
8167-
Assert(IsA(tle_expr, Param) ||(IsA(tle_expr, Var) &&
8168-
((Var *) tle_expr)->varno == OUTER_VAR));
8167+
Assert(IsA(tle_expr, Param) ||(IsA(tle_expr, Var) &&
8168+
((Var *) tle_expr)->varno == OUTER_VAR));
81698169
/* Descend to the child node */
81708170
plan = plan->lefttree;
81718171
}

‎src/timezone/localtime.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ detzcode(const char *const codep)
138138
* Do two's-complement negation even on non-two's-complement machines.
139139
* If the result would be minval - 1, return minval.
140140
*/
141-
result -= !TWOS_COMPLEMENT(int32) &&result != 0;
141+
result -= !TWOS_COMPLEMENT(int32) &&result != 0;
142142
result += minval;
143143
}
144144
return result;
@@ -152,7 +152,7 @@ detzcode64(const char *const codep)
152152
int64one = 1;
153153
int64halfmaxval = one << (64 - 2);
154154
int64maxval = halfmaxval - 1 + halfmaxval;
155-
int64minval = -TWOS_COMPLEMENT(int64) -maxval;
155+
int64minval = -TWOS_COMPLEMENT(int64) -maxval;
156156

157157
result = codep[0] & 0x7f;
158158
for (i = 1; i < 8; ++i)
@@ -164,7 +164,7 @@ detzcode64(const char *const codep)
164164
* Do two's-complement negation even on non-two's-complement machines.
165165
* If the result would be minval - 1, return minval.
166166
*/
167-
result -= !TWOS_COMPLEMENT(int64) &&result != 0;
167+
result -= !TWOS_COMPLEMENT(int64) &&result != 0;
168168
result += minval;
169169
}
170170
return result;
@@ -173,7 +173,7 @@ detzcode64(const char *const codep)
173173
static bool
174174
differ_by_repeat(const pg_time_t t1, const pg_time_t t0)
175175
{
176-
if (TYPE_BIT(pg_time_t) -TYPE_SIGNED(pg_time_t) <SECSPERREPEAT_BITS)
176+
if (TYPE_BIT(pg_time_t) -TYPE_SIGNED(pg_time_t) <SECSPERREPEAT_BITS)
177177
return 0;
178178
return t1 - t0 == SECSPERREPEAT;
179179
}
@@ -1480,7 +1480,7 @@ timesub(const pg_time_t *timep, int32 offset,
14801480
intleapdays;
14811481

14821482
tdelta = tdays / DAYSPERLYEAR;
1483-
if (!((!TYPE_SIGNED(pg_time_t) ||INT_MIN <= tdelta)
1483+
if (!((!TYPE_SIGNED(pg_time_t) ||INT_MIN <= tdelta)
14841484
&& tdelta <= INT_MAX))
14851485
goto out_of_range;
14861486
idelta = tdelta;

‎src/timezone/strftime.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -505,7 +505,7 @@ _fmt(const char *format, const struct pg_tm *t, char *pt,
505505
static char *
506506
_conv(int n, const char *format, char *pt, const char *ptlim)
507507
{
508-
charbuf[INT_STRLEN_MAXIMUM(int) +1];
508+
charbuf[INT_STRLEN_MAXIMUM(int) +1];
509509

510510
sprintf(buf, format, n);
511511
return _add(buf, pt, ptlim);

‎src/timezone/zic.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ main(int argc, char **argv)
652652
umask(umask(S_IWGRP | S_IWOTH) | (S_IWGRP | S_IWOTH));
653653
#endif
654654
progname = argv[0];
655-
if (TYPE_BIT(zic_t) <64)
655+
if (TYPE_BIT(zic_t) <64)
656656
{
657657
fprintf(stderr, "%s: %s\n", progname,
658658
_("wild compilation-time specification of zic_t"));
@@ -3444,7 +3444,7 @@ yearistype(zic_t year, const char *type)
34443444
if (type == NULL || *type == '\0')
34453445
return true;
34463446
buf = emalloc(1 + 4 * strlen(yitcommand) + 2
3447-
+ INT_STRLEN_MAXIMUM(zic_t) +2 + 4 * strlen(type) + 2);
3447+
+ INT_STRLEN_MAXIMUM(zic_t) +2 + 4 * strlen(type) + 2);
34483448
b = shellquote(buf, yitcommand);
34493449
*b++ = ' ';
34503450
b += sprintf(b, INT64_FORMAT, year);

‎src/tools/pgindent/pgindent

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ use IO::Handle;
1212
use Getopt::Long;
1313

1414
# Update for pg_bsd_indent version
15-
my $INDENT_VERSION = "2.1";
15+
my $INDENT_VERSION = "2.1.1";
1616

1717
# Our standard indent settings
1818
my $indent_opts =
@@ -79,7 +79,7 @@ sub check_indent
7979
exit 1;
8080
}
8181

82-
if (`$indent --version` !~ m/ $INDENT_VERSION$/)
82+
if (`$indent --version` !~ m/ $INDENT_VERSION/)
8383
{
8484
print STDERR
8585
"You do not appear to have $indent version $INDENT_VERSION installed on your system.\n";

0 commit comments

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