From 95279fb15fb5541de9c3bb3cd1a4e4b28efe53ca Mon Sep 17 00:00:00 2001
From: Fabrizio Fabbri <fabrizio.fabbri@gmail.com>
Date: Fri, 19 May 2017 19:18:16 +0200
Subject: [PATCH] Code review on merge request !65

---
 src/c/dpp.c             | 11 +++++------
 src/c/file.d            |  3 +--
 src/c/numbers/ceiling.d |  2 +-
 src/c/unixsys.d         |  2 +-
 src/cmp/cmpmain.lsp     |  2 +-
 5 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/c/dpp.c b/src/c/dpp.c
index e231e7534..d6b5d56a6 100755
--- a/src/c/dpp.c
+++ b/src/c/dpp.c
@@ -764,12 +764,11 @@ put_declaration(void)
       put_lineno();
       fprintf(out, "\t}\n");
     }
-    if (simple_varargs)
-	    fprintf(out,"\tva_end(%s);\n",
-	            rest_var);
-    else
-	    fprintf(out,"\n\tecl_va_end(%s);\n",
-	            rest_var);
+    if (simple_varargs) {
+	    fprintf(out,"\tva_end(%s);\n", rest_var);
+    } else {
+	    fprintf(out,"\tecl_va_end(%s);\n", rest_var);
+    }
     if (key_flag) {
       put_lineno();
       fprintf(out, "\tcl_parse_key(ARGS, %d, KEYS, KEY_VARS, NULL, %d);\n",
diff --git a/src/c/file.d b/src/c/file.d
index 1f8cad495..4fb81c896 100755
--- a/src/c/file.d
+++ b/src/c/file.d
@@ -5328,8 +5328,7 @@ flisten(cl_object stream, FILE *fp)
   {
     /* regular file */
     ecl_off_t old_pos = ecl_ftello(fp), end_pos;
-    unlikely_if (old_pos == -1
-                 ||
+    unlikely_if (old_pos == -1 ||
                  ecl_fseeko(fp, 0, SEEK_END) != 0)
       file_libc_error(@[file-error], stream,
                       "Unable to check file position", 0);
diff --git a/src/c/numbers/ceiling.d b/src/c/numbers/ceiling.d
index 7924d2ac9..b1b32f120 100644
--- a/src/c/numbers/ceiling.d
+++ b/src/c/numbers/ceiling.d
@@ -77,7 +77,7 @@ ecl_ceiling2(cl_object x, cl_object y)
   const cl_env_ptr the_env = ecl_process_env();
   cl_object v0, v1;
   cl_type ty;
-  v0 = v1 = Cnil;
+  v0 = v1 = ECL_NIL;
   ty = ecl_t_of(y);
   if (ecl_unlikely(!ECL_REAL_TYPE_P(ty))) {
     FEwrong_type_nth_arg(@[ceiling],2, y, @[real]);
diff --git a/src/c/unixsys.d b/src/c/unixsys.d
index f034018bd..149b9fe13 100644
--- a/src/c/unixsys.d
+++ b/src/c/unixsys.d
@@ -533,7 +533,7 @@ si_spawn_subprocess(cl_object command, cl_object argv, cl_object environ,
   if (Null(pid)) {
     if (parent_write) close(parent_write);
     if (parent_read) close(parent_read);
-    if (parent_error >= 0) close(parent_error);
+    if (parent_error > 0) close(parent_error);
     parent_write = 0;
     parent_read = 0;
     parent_error = 0;
diff --git a/src/cmp/cmpmain.lsp b/src/cmp/cmpmain.lsp
index 5ecd9b24b..5772b5948 100755
--- a/src/cmp/cmpmain.lsp
+++ b/src/cmp/cmpmain.lsp
@@ -262,7 +262,7 @@ void ~A(cl_object cblock)
          * circular chain. This disables the garbage collection of
          * the library until _ALL_ functions in all modules are unlinked.
          */
-        cl_object current = Cnil, next = Cblock;
+        cl_object current = OBJNULL, next = Cblock;
 ~:{
         current = ecl_make_codeblock();
         current->cblock.next = next;