aboutsummaryrefslogtreecommitdiff
path: root/src/pj_fileapi.cpp
diff options
context:
space:
mode:
authorEven Rouault <even.rouault@spatialys.com>2018-12-18 21:31:28 +0100
committerEven Rouault <even.rouault@spatialys.com>2018-12-26 10:08:53 +0100
commit8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 (patch)
tree1cd5751c91202070ba3ab6fbbbfbeb7832b980fc /src/pj_fileapi.cpp
parent919dc5ca50839541568ef5c0f18f2156d639beef (diff)
downloadPROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz
PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/pj_fileapi.cpp')
-rw-r--r--src/pj_fileapi.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/pj_fileapi.cpp b/src/pj_fileapi.cpp
index eba96afd..3df73236 100644
--- a/src/pj_fileapi.cpp
+++ b/src/pj_fileapi.cpp
@@ -75,9 +75,9 @@ static PAFile stdio_fopen(projCtx ctx, const char *filename,
FILE *fp;
fp = fopen(filename, access);
- if (fp == NULL)
+ if (fp == nullptr)
{
- return NULL;
+ return nullptr;
}
pafile = (stdio_pafile *) malloc(sizeof(stdio_pafile));
@@ -85,7 +85,7 @@ static PAFile stdio_fopen(projCtx ctx, const char *filename,
{
pj_ctx_set_errno(ctx, ENOMEM);
fclose(fp);
- return NULL;
+ return nullptr;
}
pafile->fp = fp;
@@ -193,7 +193,7 @@ char *pj_ctx_fgets(projCtx ctx, char *line, int size, PAFile file)
line[size-1] = '\0';
bytes_read = pj_ctx_fread(ctx, line, 1, size-1, file);
if(bytes_read == 0)
- return NULL;
+ return nullptr;
if(bytes_read < (size_t)size)
{
line[bytes_read] = '\0';