INN commit: trunk (3 files)

INN Commit rra at isc.org
Mon May 25 10:04:16 UTC 2015


    Date: Monday, May 25, 2015 @ 03:04:16
  Author: iulius
Revision: 9884

Handle NULL argument to process_free

This clears up a Clang warning.

Modified:
  trunk/support/getc-tap-harness
  trunk/tests/tap/basic.c
  trunk/tests/tap/process.c

--------------------------+
 support/getc-tap-harness |    6 +++---
 tests/tap/basic.c        |    1 -
 tests/tap/process.c      |    4 ++++
 3 files changed, 7 insertions(+), 4 deletions(-)

Modified: support/getc-tap-harness
===================================================================
--- support/getc-tap-harness	2015-05-25 10:03:20 UTC (rev 9883)
+++ support/getc-tap-harness	2015-05-25 10:04:16 UTC (rev 9884)
@@ -73,7 +73,7 @@
     # Specific additions to a few files.
     if [ "$3" = "basic.c" ]
     then
-      sed -i -e "57 i \\
+      sed -i -e "56 i \\
 /* Specific to the integration of C TAP Harness in INN. */\\
 #ifndef LIBTEST_NEW_FORMAT\\
 # include \"inn/libinn.h\"\\
@@ -121,9 +121,9 @@
 }\\
 #endif\\
 " \
-             -e "152 i \\
+             -e "151 i \\
 #ifndef INN_LIBINN_H" \
-             -e "186 i \\
+             -e "185 i \\
 #endif" \
              -e 's/^ok.int /new_ok(int /g' \
              -e 's/^skip.const /new_skip(const /g' \

Modified: tests/tap/basic.c
===================================================================
--- tests/tap/basic.c	2015-05-25 10:03:20 UTC (rev 9883)
+++ tests/tap/basic.c	2015-05-25 10:04:16 UTC (rev 9884)
@@ -37,7 +37,6 @@
  * DEALINGS IN THE SOFTWARE.
  */
 
-#include <assert.h>
 #include <errno.h>
 #include <limits.h>
 #include <stdarg.h>

Modified: tests/tap/process.c
===================================================================
--- tests/tap/process.c	2015-05-25 10:03:20 UTC (rev 9883)
+++ tests/tap/process.c	2015-05-25 10:04:16 UTC (rev 9884)
@@ -235,6 +235,10 @@
 {
     struct process **prev;
 
+    /* Do nothing if called with a NULL argument. */
+    if (process == NULL)
+        return;
+
     /* Remove the process from the global list. */
     prev = &processes;
     while (*prev != NULL && *prev != process)



More information about the inn-committers mailing list