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

Commit753c9cb

Browse files
committed
Fix for Size sizeof in cache code.
1 parent8135140 commit753c9cb

File tree

1 file changed

+19
-19
lines changed

1 file changed

+19
-19
lines changed

‎src/backend/utils/cache/relcache.c

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
*
88
*
99
* IDENTIFICATION
10-
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.53 1999/01/17 06:18:51 momjian Exp $
10+
* $Header: /cvsroot/pgsql/src/backend/utils/cache/relcache.c,v 1.54 1999/01/22 16:49:25 momjian Exp $
1111
*
1212
*-------------------------------------------------------------------------
1313
*/
@@ -1876,7 +1876,7 @@ init_irels(void)
18761876
for (relno=0;relno<Num_indices_bootstrap;relno++)
18771877
{
18781878
/* first read the relation descriptor length */
1879-
if ((nread=FileRead(fd, (char*)&len,sizeof(int)))!=sizeof(int))
1879+
if ((nread=FileRead(fd, (char*)&len,sizeof(len)))!=sizeof(len))
18801880
{
18811881
write_irels();
18821882
return;
@@ -1899,7 +1899,7 @@ init_irels(void)
18991899
ird->lockInfo= (char*)NULL;
19001900

19011901
/* next, read the access method tuple form */
1902-
if ((nread=FileRead(fd, (char*)&len,sizeof(int)))!=sizeof(int))
1902+
if ((nread=FileRead(fd, (char*)&len,sizeof(len)))!=sizeof(len))
19031903
{
19041904
write_irels();
19051905
return;
@@ -1915,7 +1915,7 @@ init_irels(void)
19151915
ird->rd_am=am;
19161916

19171917
/* next read the relation tuple form */
1918-
if ((nread=FileRead(fd, (char*)&len,sizeof(int)))!=sizeof(int))
1918+
if ((nread=FileRead(fd, (char*)&len,sizeof(len)))!=sizeof(len))
19191919
{
19201920
write_irels();
19211921
return;
@@ -1937,7 +1937,7 @@ init_irels(void)
19371937
len=ATTRIBUTE_TUPLE_SIZE;
19381938
for (i=0;i<relform->relnatts;i++)
19391939
{
1940-
if ((nread=FileRead(fd, (char*)&len,sizeof(int)))!=sizeof(int))
1940+
if ((nread=FileRead(fd, (char*)&len,sizeof(len)))!=sizeof(len))
19411941
{
19421942
write_irels();
19431943
return;
@@ -1953,7 +1953,7 @@ init_irels(void)
19531953
}
19541954

19551955
/* next, read the index strategy map */
1956-
if ((nread=FileRead(fd, (char*)&len,sizeof(int)))!=sizeof(int))
1956+
if ((nread=FileRead(fd, (char*)&len,sizeof(len)))!=sizeof(len))
19571957
{
19581958
write_irels();
19591959
return;
@@ -1985,7 +1985,7 @@ init_irels(void)
19851985
ird->rd_istrat=strat;
19861986

19871987
/* finally, read the vector of support procedures */
1988-
if ((nread=FileRead(fd, (char*)&len,sizeof(int)))!=sizeof(int))
1988+
if ((nread=FileRead(fd, (char*)&len,sizeof(len)))!=sizeof(len))
19891989
{
19901990
write_irels();
19911991
return;
@@ -2082,8 +2082,8 @@ write_irels(void)
20822082
len=sizeof(RelationData);
20832083

20842084
/* first, write the relation descriptor length */
2085-
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(int)))
2086-
!=sizeof(int))
2085+
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(len)))
2086+
!=sizeof(len))
20872087
elog(FATAL,"cannot write init file -- descriptor length");
20882088

20892089
/* next, write out the Relation structure */
@@ -2092,17 +2092,17 @@ write_irels(void)
20922092

20932093
/* next, write the access method tuple form */
20942094
len=sizeof(FormData_pg_am);
2095-
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(int)))
2096-
!=sizeof(int))
2095+
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(len)))
2096+
!=sizeof(len))
20972097
elog(FATAL,"cannot write init file -- am tuple form length");
20982098

20992099
if ((nwritten=FileWrite(fd, (char*)am,len))!=len)
21002100
elog(FATAL,"cannot write init file -- am tuple form");
21012101

21022102
/* next write the relation tuple form */
21032103
len=sizeof(FormData_pg_class);
2104-
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(int)))
2105-
!=sizeof(int))
2104+
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(len)))
2105+
!=sizeof(len))
21062106
elog(FATAL,"cannot write init file -- relation tuple form length");
21072107

21082108
if ((nwritten=FileWrite(fd, (char*)relform,len))!=len)
@@ -2112,8 +2112,8 @@ write_irels(void)
21122112
len=ATTRIBUTE_TUPLE_SIZE;
21132113
for (i=0;i<relform->relnatts;i++)
21142114
{
2115-
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(int)))
2116-
!=sizeof(int))
2115+
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(len)))
2116+
!=sizeof(len))
21172117
elog(FATAL,"cannot write init file -- length of attdesc %d",i);
21182118
if ((nwritten=FileWrite(fd, (char*)ird->rd_att->attrs[i],len))
21192119
!=len)
@@ -2123,17 +2123,17 @@ write_irels(void)
21232123
/* next, write the index strategy map */
21242124
len=AttributeNumberGetIndexStrategySize(relform->relnatts,
21252125
am->amstrategies);
2126-
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(int)))
2127-
!=sizeof(int))
2126+
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(len)))
2127+
!=sizeof(len))
21282128
elog(FATAL,"cannot write init file -- strategy map length");
21292129

21302130
if ((nwritten=FileWrite(fd, (char*)strat,len))!=len)
21312131
elog(FATAL,"cannot write init file -- strategy map");
21322132

21332133
/* finally, write the vector of support procedures */
21342134
len=relform->relnatts* (am->amsupport*sizeof(RegProcedure));
2135-
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(int)))
2136-
!=sizeof(int))
2135+
if ((nwritten=FileWrite(fd, (char*)&len,sizeof(len)))
2136+
!=sizeof(len))
21372137
elog(FATAL,"cannot write init file -- support vector length");
21382138

21392139
if ((nwritten=FileWrite(fd, (char*)support,len))!=len)

0 commit comments

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