From 610957f7035242f15743c399ffd429b92bc36206 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 18 Dec 2018 20:24:11 +0100 Subject: cpp conversion: minimal steps to fix compilation errors, not warnings --- src/vector1.cpp | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 src/vector1.cpp (limited to 'src/vector1.cpp') diff --git a/src/vector1.cpp b/src/vector1.cpp new file mode 100644 index 00000000..22e1f5d0 --- /dev/null +++ b/src/vector1.cpp @@ -0,0 +1,29 @@ +/* make storage for one and two dimensional matricies */ +#include +#include "projects.h" + void * /* one dimension array */ +vector1(int nvals, int size) { return((void *)pj_malloc(size * nvals)); } + void /* free 2D array */ +freev2(void **v, int nrows) { + if (v) { + for (v += nrows; nrows > 0; --nrows) + pj_dalloc(*--v); + pj_dalloc(v); + } +} + void ** /* two dimension array */ +vector2(int nrows, int ncols, int size) { + void **s; + + if ((s = (void **)pj_malloc(sizeof(void *) * nrows)) != NULL) { + int rsize, i; + + rsize = size * ncols; + for (i = 0; i < nrows; ++i) + if (!(s[i] = pj_malloc(rsize))) { + freev2(s, i); + return (void **)0; + } + } + return s; +} -- cgit v1.2.3 From 8211f48b1ac6c941f46a8f2df90bdbfdcbc85981 Mon Sep 17 00:00:00 2001 From: Even Rouault Date: Tue, 18 Dec 2018 21:31:28 +0100 Subject: cpp conversion: fix zero-as-null-pointer-constant warnings --- src/vector1.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/vector1.cpp') diff --git a/src/vector1.cpp b/src/vector1.cpp index 22e1f5d0..869dd76a 100644 --- a/src/vector1.cpp +++ b/src/vector1.cpp @@ -15,14 +15,14 @@ freev2(void **v, int nrows) { vector2(int nrows, int ncols, int size) { void **s; - if ((s = (void **)pj_malloc(sizeof(void *) * nrows)) != NULL) { + if ((s = (void **)pj_malloc(sizeof(void *) * nrows)) != nullptr) { int rsize, i; rsize = size * ncols; for (i = 0; i < nrows; ++i) if (!(s[i] = pj_malloc(rsize))) { freev2(s, i); - return (void **)0; + return (void **)nullptr; } } return s; -- cgit v1.2.3