aboutsummaryrefslogtreecommitdiff
path: root/src/pj_malloc.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_malloc.cpp
parent919dc5ca50839541568ef5c0f18f2156d639beef (diff)
downloadPROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.tar.gz
PROJ-8211f48b1ac6c941f46a8f2df90bdbfdcbc85981.zip
cpp conversion: fix zero-as-null-pointer-constant warnings
Diffstat (limited to 'src/pj_malloc.cpp')
-rw-r--r--src/pj_malloc.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/pj_malloc.cpp b/src/pj_malloc.cpp
index 66977cf4..c8681570 100644
--- a/src/pj_malloc.cpp
+++ b/src/pj_malloc.cpp
@@ -95,8 +95,8 @@ It allocates space for an array of <n> elements of size <size>.
The array is initialized to zeros.
***********************************************************************/
void *res = pj_malloc (n*size);
- if (0==res)
- return 0;
+ if (nullptr==res)
+ return nullptr;
memset (res, 0, n*size);
return res;
}
@@ -128,10 +128,10 @@ pointer" to signal an error in a multi level allocation:
return p; // success
***********************************************************************/
- if (0==ptr)
- return 0;
+ if (nullptr==ptr)
+ return nullptr;
pj_dalloc (ptr);
- return 0;
+ return nullptr;
}
/**********************************************************************/
@@ -161,7 +161,7 @@ void *pj_dealloc_params (PJ_CONTEXT *ctx, paralist *start, int errlev) {
pj_dealloc(t);
}
pj_ctx_set_errno (ctx, errlev);
- return (void *) 0;
+ return (void *) nullptr;
}
@@ -178,7 +178,7 @@ void *pj_dealloc_params (PJ_CONTEXT *ctx, paralist *start, int errlev) {
/************************************************************************/
void pj_free(PJ *P) {
- if (0==P)
+ if (nullptr==P)
return;
/* free projection parameters - all the hard work is done by */
/* pj_default_destructor, which is supposed */
@@ -205,8 +205,8 @@ PJ *pj_default_destructor (PJ *P, int errlev) { /* Destructor */
if (0!=errlev)
pj_ctx_set_errno (pj_get_ctx(P), errlev);
- if (0==P)
- return 0;
+ if (nullptr==P)
+ return nullptr;
/* free grid lists */
pj_dealloc( P->gridlist );