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

Commit1e5eb16

Browse files
committed
Change -> and <- to use proper ampersand markups.
HEAD and 8.0.X.
1 parent082283b commit1e5eb16

File tree

8 files changed

+64
-64
lines changed

8 files changed

+64
-64
lines changed

‎doc/src/sgml/cvs.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.30 2005/01/06 01:49:22 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/cvs.sgml,v 1.31 2005/01/22 22:06:17 momjian Exp $
33
-->
44

55
<appendix id="cvs">
@@ -214,7 +214,7 @@ $ cvs checkout -r REL6_4 tc
214214
<programlisting>
215215
file1 file2 file3 file4 file5
216216

217-
1.1 1.1 1.1 1.1 /--1.1*<-*- TAG
217+
1.1 1.1 1.1 1.1 /--1.1*&lt;-*- TAG
218218
1.2*- 1.2 1.2 -1.2*-
219219
1.3 \- 1.3*- 1.3 / 1.3
220220
1.4 \ 1.4 / 1.4

‎doc/src/sgml/indexcost.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/indexcost.sgml,v 2.18 2003/11/29 19:51:37 pgsql Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/indexcost.sgml,v 2.19 2005/01/22 22:06:17 momjian Exp $
33
-->
44

55
<chapter id="indexcost">
@@ -205,7 +205,7 @@ amcostestimate (Query *root,
205205

206206
<programlisting>
207207
*indexSelectivity = clauselist_selectivity(root, indexQuals,
208-
rel->relid, JOIN_INNER);
208+
rel-&gt;relid, JOIN_INNER);
209209
</programlisting>
210210
</para>
211211
</step>

‎doc/src/sgml/plhandler.sgml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/plhandler.sgml,v 1.4 2005/01/05 23:42:03 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/plhandler.sgml,v 1.5 2005/01/22 22:06:17 momjian Exp $
33
-->
44

55
<chapter id="plhandler">
@@ -121,7 +121,7 @@ plsample_call_handler(PG_FUNCTION_ARGS)
121121
/*
122122
* Called as a trigger procedure
123123
*/
124-
TriggerData *trigdata = (TriggerData *) fcinfo->context;
124+
TriggerData *trigdata = (TriggerData *) fcinfo-&gt;context;
125125

126126
retval = ...
127127
}

‎doc/src/sgml/release.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.321 2005/01/15 21:11:46 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/release.sgml,v 1.322 2005/01/22 22:06:17 momjian Exp $
33
-->
44

55
<appendix id="release">
@@ -7138,7 +7138,7 @@ Added documentation to tarball.
71387138
<programlisting>
71397139
Fix many CLUSTER failures (Tom)
71407140
Allow ALTER TABLE RENAME works on indexes (Tom)
7141-
Fix plpgsql to handle datetime->timestamp and timespan->interval (Bruce)
7141+
Fix plpgsql to handle datetime-&gt;timestamp and timespan-&gt;interval (Bruce)
71427142
New configure --with-setproctitle switch to use setproctitle() (Marc, Bruce)
71437143
Fix the off by one errors in ResultSet from 6.5.3, and more.
71447144
jdbc ResultSet fixes (Joseph Shraibman)
@@ -8017,7 +8017,7 @@ Add Win1250 (Czech) support (Pavel Behal)
80178017
<programlisting>
80188018
Bug Fixes
80198019
---------
8020-
Fix text<->float8 and text<->float4 conversion functions(Thomas)
8020+
Fix text&lt;-&gt;float8 and text&lt;-&gt;float4 conversion functions(Thomas)
80218021
Fix for creating tables with mixed-case constraints(Billy)
80228022
Change exp()/pow() behavior to generate error on underflow/overflow(Jan)
80238023
Fix bug in pg_dump -z
@@ -9225,7 +9225,7 @@ Check explicitly for points and polygons contained within polygons
92259225
using an axis-crossing algorithm(Thomas)
92269226
Add routine to convert circle-box(Thomas)
92279227
Merge conflicting operators for different geometric data types(Thomas)
9228-
Replace distance operator "<===>" with "<->"(Thomas)
9228+
Replace distance operator "<===>" with "&lt;-&gt;"(Thomas)
92299229
Replace "above" operator "!^" with "&gt;^" and "below" operator "!|" with "&lt;^"(Thomas)
92309230
Add routines for text trimming on both ends, substring, and string position(Thomas)
92319231
Added conversion routines circle(box) and poly(circle)(Thomas)
@@ -10093,9 +10093,9 @@ more compliant to the SQL-92 standard):
1009310093
char(N), varchar(N), date and time.
1009410094

1009510095
The following are aliases to existing postgres types:
10096-
smallint -> int2
10097-
integer, int -> int4
10098-
float, real -> float4
10096+
smallint -&gt; int2
10097+
integer, int -&gt; int4
10098+
float, real -&gt; float4
1009910099
char(N) and varchar(N) are implemented as truncated text types. In
1010010100
addition, char(N) does blank-padding.
1010110101
* single-quote (') is used for quoting string literals; '' (in addition to

‎doc/src/sgml/rules.sgml

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.37 2004/12/30 03:13:56 tgl Exp $ -->
1+
<!-- $PostgreSQL: pgsql/doc/src/sgml/rules.sgml,v 1.38 2005/01/22 22:06:27 momjian Exp $ -->
22

33
<Chapter Id="rules">
44
<Title>The Rule System</Title>
@@ -1565,26 +1565,26 @@ UPDATE shoelace_data
15651565

15661566
<literallayout class="monospaced">
15671567
Nested Loop
1568-
-> Merge Join
1569-
-> Seq Scan
1570-
-> Sort
1571-
-> Seq Scan on s
1572-
-> Seq Scan
1573-
-> Sort
1574-
-> Seq Scan on shoelace_arrive
1575-
-> Seq Scan on shoelace_data
1568+
-&gt; Merge Join
1569+
-&gt; Seq Scan
1570+
-&gt; Sort
1571+
-&gt; Seq Scan on s
1572+
-&gt; Seq Scan
1573+
-&gt; Sort
1574+
-&gt; Seq Scan on shoelace_arrive
1575+
-&gt; Seq Scan on shoelace_data
15761576
</literallayout>
15771577

15781578
while omitting the extra range table entry would result in a
15791579

15801580
<literallayout class="monospaced">
15811581
Merge Join
1582-
-> Seq Scan
1583-
-> Sort
1584-
-> Seq Scan on s
1585-
-> Seq Scan
1586-
-> Sort
1587-
-> Seq Scan on shoelace_arrive
1582+
-&gt; Seq Scan
1583+
-&gt; Sort
1584+
-&gt; Seq Scan on s
1585+
-&gt; Seq Scan
1586+
-&gt; Sort
1587+
-&gt; Seq Scan on shoelace_arrive
15881588
</literallayout>
15891589

15901590
which produces exactly the same entries in the log table. Thus,
@@ -1943,8 +1943,8 @@ DELETE FROM software WHERE computer.hostname = 'mypc.local.net'
19431943

19441944
<literallayout class="monospaced">
19451945
Nestloop
1946-
-> Index Scan using comp_hostidx on computer
1947-
-> Index Scan using soft_hostidx on software
1946+
-&gt; Index Scan using comp_hostidx on computer
1947+
-&gt; Index Scan using soft_hostidx on software
19481948
</literallayout>
19491949

19501950
So there would be not that much difference in speed between
@@ -1973,9 +1973,9 @@ DELETE FROM software WHERE computer.hostname >= 'old' AND computer.hostname < 'o
19731973

19741974
<literallayout class="monospaced">
19751975
Hash Join
1976-
-> Seq Scan on software
1977-
-> Hash
1978-
-> Index Scan using comp_hostidx on computer
1976+
-&gt; Seq Scan on software
1977+
-&gt; Hash
1978+
-&gt; Index Scan using comp_hostidx on computer
19791979
</literallayout>
19801980

19811981
The other possible command is
@@ -1989,8 +1989,8 @@ DELETE FROM computer WHERE hostname ~ '^old';
19891989

19901990
<literallayout class="monospaced">
19911991
Nestloop
1992-
-> Index Scan using comp_hostidx on computer
1993-
-> Index Scan using soft_hostidx on software
1992+
-&gt; Index Scan using comp_hostidx on computer
1993+
-&gt; Index Scan using soft_hostidx on software
19941994
</literallayout>
19951995

19961996
This shows, that the planner does not realize that the
@@ -2030,8 +2030,8 @@ DELETE FROM software WHERE computer.manufacurer = 'bim'
20302030

20312031
<ProgramListing>
20322032
Nestloop
2033-
-> Index Scan using comp_manufidx on computer
2034-
-> Index Scan using soft_hostidx on software
2033+
-&gt; Index Scan using comp_manufidx on computer
2034+
-&gt; Index Scan using soft_hostidx on software
20352035
</ProgramListing>
20362036

20372037
In any of these cases, the extra commands from the rule system

‎doc/src/sgml/spi.sgml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.37 2004/12/30 21:45:37 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/spi.sgml,v 1.38 2005/01/22 22:06:27 momjian Exp $
33
-->
44

55
<chapter id="spi">
@@ -2931,19 +2931,19 @@ execq(text *sql, int cnt)
29312931
*/
29322932
if (ret == SPI_OK_SELECT && SPI_processed > 0)
29332933
{
2934-
TupleDesc tupdesc = SPI_tuptable->tupdesc;
2934+
TupleDesc tupdesc = SPI_tuptable-&gt;tupdesc;
29352935
SPITupleTable *tuptable = SPI_tuptable;
29362936
char buf[8192];
29372937
int i, j;
29382938

29392939
for (j = 0; j < proc; j++)
29402940
{
2941-
HeapTuple tuple = tuptable->vals[j];
2941+
HeapTuple tuple = tuptable-&gt;vals[j];
29422942

2943-
for (i = 1, buf[0] = 0; i <= tupdesc->natts; i++)
2943+
for (i = 1, buf[0] = 0; i <= tupdesc-&gt;natts; i++)
29442944
snprintf(buf + strlen (buf), sizeof(buf) - strlen(buf), " %s%s",
29452945
SPI_getvalue(tuple, tupdesc, i),
2946-
(i == tupdesc->natts) ? " " : " |");
2946+
(i == tupdesc-&gt;natts) ? " " : " |");
29472947
elog (INFO, "EXECQ: %s", buf);
29482948
}
29492949
}

‎doc/src/sgml/trigger.sgml

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.39 2004/12/30 03:13:56 tgl Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/trigger.sgml,v 1.40 2005/01/22 22:06:27 momjian Exp $
33
-->
44

55
<chapter id="triggers">
@@ -271,10 +271,10 @@ CALLED_AS_TRIGGER(fcinfo)
271271
</programlisting>
272272
which expands to
273273
<programlisting>
274-
((fcinfo)->context != NULL && IsA((fcinfo)->context, TriggerData))
274+
((fcinfo)-&gt;context != NULL && IsA((fcinfo)-&gt;context, TriggerData))
275275
</programlisting>
276276
If this returns true, then it is safe to cast
277-
<literal>fcinfo->context</> to type <literal>TriggerData
277+
<literal>fcinfo-&gt;context</> to type <literal>TriggerData
278278
*</literal> and make use of the pointed-to
279279
<structname>TriggerData</> structure. The function must
280280
<emphasis>not</emphasis> alter the <structname>TriggerData</>
@@ -393,8 +393,8 @@ typedef struct TriggerData
393393
A pointer to a structure describing the relation that the trigger fired for.
394394
Look at <filename>utils/rel.h</> for details about
395395
this structure. The most interesting things are
396-
<literal>tg_relation->rd_att</> (descriptor of the relation
397-
tuples) and <literal>tg_relation->rd_rel->relname</>
396+
<literal>tg_relation-&gt;rd_att</> (descriptor of the relation
397+
tuples) and <literal>tg_relation-&gt;rd_rel-&gt;relname</>
398398
(relation name; the type is not <type>char*</> but
399399
<type>NameData</>; use
400400
<literal>SPI_getrelname(tg_relation)</> to get a <type>char*</> if you
@@ -541,7 +541,7 @@ PG_FUNCTION_INFO_V1(trigf);
541541
Datum
542542
trigf(PG_FUNCTION_ARGS)
543543
{
544-
TriggerData *trigdata = (TriggerData *) fcinfo->context;
544+
TriggerData *trigdata = (TriggerData *) fcinfo-&gt;context;
545545
TupleDesc tupdesc;
546546
HeapTuple rettuple;
547547
char *when;
@@ -554,22 +554,22 @@ trigf(PG_FUNCTION_ARGS)
554554
elog(ERROR, "trigf: not called by trigger manager");
555555

556556
/* tuple to return to executor */
557-
if (TRIGGER_FIRED_BY_UPDATE(trigdata->tg_event))
558-
rettuple = trigdata->tg_newtuple;
557+
if (TRIGGER_FIRED_BY_UPDATE(trigdata-&gt;tg_event))
558+
rettuple = trigdata-&gt;tg_newtuple;
559559
else
560-
rettuple = trigdata->tg_trigtuple;
560+
rettuple = trigdata-&gt;tg_trigtuple;
561561

562562
/* check for null values */
563-
if (!TRIGGER_FIRED_BY_DELETE(trigdata->tg_event)
564-
&& TRIGGER_FIRED_BEFORE(trigdata->tg_event))
563+
if (!TRIGGER_FIRED_BY_DELETE(trigdata-&gt;tg_event)
564+
&& TRIGGER_FIRED_BEFORE(trigdata-&gt;tg_event))
565565
checknull = true;
566566

567-
if (TRIGGER_FIRED_BEFORE(trigdata->tg_event))
567+
if (TRIGGER_FIRED_BEFORE(trigdata-&gt;tg_event))
568568
when = "before";
569569
else
570570
when = "after ";
571571

572-
tupdesc = trigdata->tg_relation->rd_att;
572+
tupdesc = trigdata-&gt;tg_relation-&gt;rd_att;
573573

574574
/* connect to SPI manager */
575575
if ((ret = SPI_connect()) < 0)
@@ -582,8 +582,8 @@ trigf(PG_FUNCTION_ARGS)
582582
elog(NOTICE, "trigf (fired %s): SPI_exec returned %d", when, ret);
583583

584584
/* count(*) returns int8, so be careful to convert */
585-
i = DatumGetInt64(SPI_getbinval(SPI_tuptable->vals[0],
586-
SPI_tuptable->tupdesc,
585+
i = DatumGetInt64(SPI_getbinval(SPI_tuptable-&gt;vals[0],
586+
SPI_tuptable-&gt;tupdesc,
587587
1,
588588
&amp;isnull));
589589

‎doc/src/sgml/xfunc.sgml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<!--
2-
$PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.96 2005/01/14 21:46:09 jurka Exp $
2+
$PostgreSQL: pgsql/doc/src/sgml/xfunc.sgml,v 1.97 2005/01/22 22:06:27 momjian Exp $
33
-->
44

55
<sect1 id="xfunc">
@@ -1482,8 +1482,8 @@ makepoint(Point *pointx, Point *pointy)
14821482
{
14831483
Point *new_point = (Point *) palloc(sizeof(Point));
14841484

1485-
new_point->x = pointx->x;
1486-
new_point->y = pointy->y;
1485+
new_point-&gt;x = pointx-&gt;x;
1486+
new_point-&gt;y = pointy-&gt;y;
14871487

14881488
return new_point;
14891489
}
@@ -1665,8 +1665,8 @@ makepoint(PG_FUNCTION_ARGS)
16651665
Point *pointy = PG_GETARG_POINT_P(1);
16661666
Point *new_point = (Point *) palloc(sizeof(Point));
16671667

1668-
new_point->x = pointx->x;
1669-
new_point->y = pointy->y;
1668+
new_point-&gt;x = pointx-&gt;x;
1669+
new_point-&gt;y = pointy-&gt;y;
16701670

16711671
PG_RETURN_POINT_P(new_point);
16721672
}
@@ -2447,7 +2447,7 @@ my_set_returning_function(PG_FUNCTION_ARGS)
24472447
if (SRF_IS_FIRSTCALL())
24482448
{
24492449
funcctx = SRF_FIRSTCALL_INIT();
2450-
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
2450+
oldcontext = MemoryContextSwitchTo(funcctx-&gt;multi_call_memory_ctx);
24512451
/* One-time setup code appears here: */
24522452
<replaceable>user code</replaceable>
24532453
<replaceable>if returning composite</replaceable>
@@ -2503,7 +2503,7 @@ testpassbyval(PG_FUNCTION_ARGS)
25032503
funcctx = SRF_FIRSTCALL_INIT();
25042504

25052505
/* switch to memory context appropriate for multiple function calls */
2506-
oldcontext = MemoryContextSwitchTo(funcctx->multi_call_memory_ctx);
2506+
oldcontext = MemoryContextSwitchTo(funcctx-&gt;multi_call_memory_ctx);
25072507

25082508
/* total number of tuples to be returned */
25092509
funcctx-&gt;max_calls = PG_GETARG_UINT32(0);

0 commit comments

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