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

Commit2d4f1ba

Browse files
committed
Update types in File API
Make the argument types of the File API match stdio better:- Change the data buffer to void *, from char *.- Change FileWrite() data buffer to const on top of that.- Change amounts to size_t, from int.In passing, change the FilePrefetch() amount argument from int tooff_t, to match the underlying posix_fadvise().Discussion:https://www.postgresql.org/message-id/flat/11dda853-bb5b-59ba-a746-e168b1ce4bdb%40enterprisedb.com
1 parent4b3e379 commit2d4f1ba

File tree

2 files changed

+7
-7
lines changed
  • src
    • backend/storage/file
    • include/storage

2 files changed

+7
-7
lines changed

‎src/backend/storage/file/fd.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1980,7 +1980,7 @@ FileClose(File file)
19801980
* to read into.
19811981
*/
19821982
int
1983-
FilePrefetch(Filefile,off_toffset,intamount,uint32wait_event_info)
1983+
FilePrefetch(Filefile,off_toffset,off_tamount,uint32wait_event_info)
19841984
{
19851985
#if defined(USE_POSIX_FADVISE)&& defined(POSIX_FADV_WILLNEED)
19861986
intreturnCode;
@@ -2031,15 +2031,15 @@ FileWriteback(File file, off_t offset, off_t nbytes, uint32 wait_event_info)
20312031
}
20322032

20332033
int
2034-
FileRead(Filefile,char*buffer,intamount,off_toffset,
2034+
FileRead(Filefile,void*buffer,size_tamount,off_toffset,
20352035
uint32wait_event_info)
20362036
{
20372037
intreturnCode;
20382038
Vfd*vfdP;
20392039

20402040
Assert(FileIsValid(file));
20412041

2042-
DO_DB(elog(LOG,"FileRead: %d (%s) "INT64_FORMAT" %d %p",
2042+
DO_DB(elog(LOG,"FileRead: %d (%s) "INT64_FORMAT" %zu %p",
20432043
file,VfdCache[file].fileName,
20442044
(int64)offset,
20452045
amount,buffer));
@@ -2087,7 +2087,7 @@ FileRead(File file, char *buffer, int amount, off_t offset,
20872087
}
20882088

20892089
int
2090-
FileWrite(Filefile,char*buffer,intamount,off_toffset,
2090+
FileWrite(Filefile,constvoid*buffer,size_tamount,off_toffset,
20912091
uint32wait_event_info)
20922092
{
20932093
intreturnCode;

‎src/include/storage/fd.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,9 @@ extern File PathNameOpenFile(const char *fileName, int fileFlags);
102102
externFilePathNameOpenFilePerm(constchar*fileName,intfileFlags,mode_tfileMode);
103103
externFileOpenTemporaryFile(boolinterXact);
104104
externvoidFileClose(Filefile);
105-
externintFilePrefetch(Filefile,off_toffset,intamount,uint32wait_event_info);
106-
externintFileRead(Filefile,char*buffer,intamount,off_toffset,uint32wait_event_info);
107-
externintFileWrite(Filefile,char*buffer,intamount,off_toffset,uint32wait_event_info);
105+
externintFilePrefetch(Filefile,off_toffset,off_tamount,uint32wait_event_info);
106+
externintFileRead(Filefile,void*buffer,size_tamount,off_toffset,uint32wait_event_info);
107+
externintFileWrite(Filefile,constvoid*buffer,size_tamount,off_toffset,uint32wait_event_info);
108108
externintFileSync(Filefile,uint32wait_event_info);
109109
externoff_tFileSize(Filefile);
110110
externintFileTruncate(Filefile,off_toffset,uint32wait_event_info);

0 commit comments

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