Remove old pj_ memory (de)allocation functions

Gone are pj_malloc, pj_calloc, pj_dalloc and pj_dealloc. Their primary
function as API memory functions in proj_api.h is no longer there and
the other use as a workaround for old errno problems is no longer valid
either.

Replaced with malloc and free across the codebase.

4 files changed, 8 insertions, 8 deletions

diff --git a/src/transformations/affine.cpp b/src/transformations/affine.cpp
index 28f73b9a..43fd8642 100644
--- a/src/transformations/affine.cpp
+++ b/src/transformations/affine.cpp
@@ -110,7 +110,7 @@ static PJ_LP reverse_2d(PJ_XY xy, PJ *P) {
 }
 
 static struct pj_opaque_affine * initQ() {
-    struct pj_opaque_affine *Q = static_cast<struct pj_opaque_affine *>(pj_calloc(1, sizeof(struct pj_opaque_affine)));
+    struct pj_opaque_affine *Q = static_cast<struct pj_opaque_affine *>(calloc(1, sizeof(struct pj_opaque_affine)));
     if (nullptr==Q)
         return nullptr;
 
diff --git a/src/transformations/helmert.cpp b/src/transformations/helmert.cpp
index d3857d89..99aa74a4 100644
--- a/src/transformations/helmert.cpp
+++ b/src/transformations/helmert.cpp
@@ -476,7 +476,7 @@ static PJ_COORD helmert_reverse_4d (PJ_COORD point, PJ *P) {
 
 
 static PJ* init_helmert_six_parameters(PJ* P) {
-    struct pj_opaque_helmert *Q = static_cast<struct pj_opaque_helmert*>(pj_calloc (1, sizeof (struct pj_opaque_helmert)));
+    struct pj_opaque_helmert *Q = static_cast<struct pj_opaque_helmert*>(calloc (1, sizeof (struct pj_opaque_helmert)));
     if (nullptr==Q)
         return pj_default_destructor (P, ENOMEM);
     P->opaque = (void *) Q;
diff --git a/src/transformations/horner.cpp b/src/transformations/horner.cpp
index a6638773..2c049186 100644
--- a/src/transformations/horner.cpp
+++ b/src/transformations/horner.cpp
@@ -89,8 +89,8 @@
 PROJ_HEAD(horner, "Horner polynomial evaluation");
 
 /* make horner.h interface with proj's memory management */
-#define horner_dealloc(x) pj_dealloc(x)
-#define horner_calloc(n,x) pj_calloc(n,x)
+#define horner_dealloc(x) free(x)
+#define horner_calloc(n,x) calloc(n,x)
 
 namespace { // anonymous namespace
 struct horner {
@@ -412,7 +412,7 @@ static int parse_coefs (PJ *P, double *coefs, const char *param, int ncoefs) {
     char *buf, *init, *next = nullptr;
     int i;
 
-    buf = static_cast<char*>(pj_calloc (strlen (param) + 2, sizeof(char)));
+    buf = static_cast<char*>(calloc (strlen (param) + 2, sizeof(char)));
     if (nullptr==buf) {
         proj_log_error (P, "Horner: No memory left");
         return 0;
@@ -420,12 +420,12 @@ static int parse_coefs (PJ *P, double *coefs, const char *param, int ncoefs) {
 
     sprintf (buf, "t%s", param);
     if (0==pj_param (P->ctx, P->params, buf).i) {
-        pj_dealloc (buf);
+        free (buf);
         return 0;
     }
     sprintf (buf, "s%s", param);
     init = pj_param(P->ctx, P->params, buf).s;
-    pj_dealloc (buf);
+    free (buf);
 
     for (i = 0; i < ncoefs; i++) {
         if (i > 0) {
diff --git a/src/transformations/molodensky.cpp b/src/transformations/molodensky.cpp
index 7d17f64c..bf5960d2 100644
--- a/src/transformations/molodensky.cpp
+++ b/src/transformations/molodensky.cpp
@@ -298,7 +298,7 @@ static PJ_COORD reverse_4d(PJ_COORD obs, PJ *P) {
 
 PJ *TRANSFORMATION(molodensky,1) {
     int count_required_params = 0;
-    struct pj_opaque_molodensky *Q = static_cast<struct pj_opaque_molodensky*>(pj_calloc(1, sizeof(struct pj_opaque_molodensky)));
+    struct pj_opaque_molodensky *Q = static_cast<struct pj_opaque_molodensky*>(calloc(1, sizeof(struct pj_opaque_molodensky)));
     if (nullptr==Q)
         return pj_default_destructor(P, ENOMEM);
     P->opaque = (void *) Q;