Linguistics: Clarify this and that, here and there (#632)

* Linguistics: Clarify this and that, here and there

* Revert nullification of PJ_cart->fwd, inv

1 files changed, 15 insertions, 17 deletions

diff --git a/src/PJ_horner.c b/src/PJ_horner.c
index d6d2c51c..a9a2c922 100644
--- a/src/PJ_horner.c
+++ b/src/PJ_horner.c
@@ -1,19 +1,3 @@
-#define PJ_LIB__
-#include "proj_internal.h"
-#include "projects.h"
-#include <assert.h>
-#include <stddef.h>
-#include <math.h>
-#include <errno.h>
-
-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)
-
-/* The next few hundred lines is mostly cut-and-paste from the horner.h header library */
-
 /***********************************************************************
 
     Interfacing to a classic piece of geodetic software
@@ -91,6 +75,20 @@ PROJ_HEAD(horner,    "Horner polynomial evaluation");
  *
  *****************************************************************************/
 
+#define PJ_LIB__
+#include "proj_internal.h"
+#include "projects.h"
+#include <assert.h>
+#include <stddef.h>
+#include <math.h>
+#include <errno.h>
+
+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)
+
 
 struct horner;
 typedef struct horner HORNER;
@@ -399,7 +397,7 @@ static int parse_coefs (PJ *P, double *coefs, char *param, int ncoefs) {
 
     buf = pj_calloc (strlen (param) + 2, sizeof(char));
     if (0==buf) {
-        proj_log_error (P, "Horner: Out of core");
+        proj_log_error (P, "Horner: No memory left");
         return 0;
     }