Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pull] master from OSGeo:master #91

Merged
merged 2 commits into from
Jan 28, 2025
Merged

[pull] master from OSGeo:master #91

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4d2e653
/vsis3/: advertize AWS_PROFILE in options
rouault Jan 28, 2025
92c186a
MiraMon: remove useless nullptr check (fixes https://github.com/OSGeo…
rouault Jan 28, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions ogr/ogrsf_frmts/miramon/mm_wrlayr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2643,13 +2643,13 @@ int MMAppendBlockToBuffer(struct MM_FLUSH_INFO *FlushInfo)
// Copy the contents of a temporary file to a final file.
// Used everywhere when closing layers.
int MMMoveFromFileToFile(FILE_TYPE *pSrcFile, FILE_TYPE *pDestFile,
MM_FILE_OFFSET *nOffset)
MM_FILE_OFFSET *pnOffset)
{
size_t bufferSize = 1024 * 1024; // 1 MB buffer;
unsigned char *buffer;
size_t bytesRead, bytesWritten;

if (!pSrcFile || !pDestFile || !nOffset)
if (!pSrcFile || !pDestFile || !pnOffset)
return 0;

buffer = (unsigned char *)calloc_function(bufferSize);
Expand All @@ -2658,7 +2658,7 @@ int MMMoveFromFileToFile(FILE_TYPE *pSrcFile, FILE_TYPE *pDestFile,
return 1;

fseek_function(pSrcFile, 0, SEEK_SET);
fseek_function(pDestFile, *nOffset, SEEK_SET);
fseek_function(pDestFile, *pnOffset, SEEK_SET);
while ((bytesRead = fread_function(buffer, sizeof(unsigned char),
bufferSize, pSrcFile)) > 0)
{
Expand All @@ -2669,8 +2669,7 @@ int MMMoveFromFileToFile(FILE_TYPE *pSrcFile, FILE_TYPE *pDestFile,
free_function(buffer);
return 1;
}
if (nOffset)
(*nOffset) += bytesWritten;
(*pnOffset) += bytesWritten;
}
free_function(buffer);
return 0;
Expand Down
6 changes: 5 additions & 1 deletion port/cpl_vsil_s3.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1929,9 +1929,13 @@ const char *VSIS3FSHandler::GetOptions()
"to "
"determine if current host is an AWS EC2 instance' "
"default='YES'/>"
" <Option name='AWS_DEFAULT_PROFILE' type='string' "
" <Option name='AWS_PROFILE' type='string' "
"description='Name of the profile to use for IAM credentials "
"retrieval on EC2 instances' default='default'/>"
" <Option name='AWS_DEFAULT_PROFILE' type='string' "
"description='(deprecated) Name of the profile to use for "
"IAM credentials "
"retrieval on EC2 instances' default='default'/>"
" <Option name='AWS_CONFIG_FILE' type='string' "
"description='Filename that contains AWS configuration' "
"default='~/.aws/config'/>"
Expand Down
Loading