* add CK_CTX_INVALID to ck_result_ctx and don't use -1 anymore

git-svn-id: svn+ssh://svn.code.sf.net/p/check/code/trunk@429 64e312b2-a51f-0410-8e61-82d0ca0eb02a

diff --git a/src/check.c b/src/check.c
index 526de36e060eb4a271069ab60e6e4e847eedd423..ca05133477f896f777180b61f658b774251dc62b 100644 (file)
--- a/src/check.c
+++ b/src/check.c
@@ -368,7 +368,7 @@ void tr_reset(TestResult *tr)
 
 static void tr_init (TestResult *tr)
 {
-  tr->ctx = -1;
+  tr->ctx = CK_CTX_INVALID;
   tr->line = -1;
   tr->rtype = -1;
   tr->msg = NULL;

diff --git a/src/check.h.in b/src/check.h.in
index 420f5fcd1a5e5acb8dcbd0f7a6b4f099cf168efb..42264b8daff8da75d1a69735d0677d7f40f75130 100644 (file)
--- a/src/check.h.in
+++ b/src/check.h.in
@@ -267,7 +267,8 @@ typedef struct SRunner SRunner;
 typedef struct TestResult TestResult;
 
 /* accessors for tr fields */
- enum ck_result_ctx {
+enum ck_result_ctx {
+  CK_CTX_INVALID,
   CK_CTX_SETUP,
   CK_CTX_TEST,
   CK_CTX_TEARDOWN

diff --git a/src/check_pack.c b/src/check_pack.c
index 81b5de400ab07c518f240f0f0945e84df0f02636..69e306605380d530ebd7bef54c1aa0d2e5b62756 100644 (file)
--- a/src/check_pack.c
+++ b/src/check_pack.c
@@ -306,7 +306,7 @@ static int get_result (char *buf, RcvMsg *rmsg)
     rcvmsg_update_ctx (rmsg, cmsg->ctx);
   } else if (type == CK_MSG_LOC) {
     LocMsg *lmsg = (LocMsg *) &msg;
-    if (rmsg->failctx == -1)
+    if (rmsg->failctx == CK_CTX_INVALID)
     {
       rcvmsg_update_loc (rmsg, lmsg->file, lmsg->line);
     }
@@ -347,8 +347,8 @@ static RcvMsg *rcvmsg_create (void)
   RcvMsg *rmsg;
 
   rmsg = emalloc (sizeof (RcvMsg));
-  rmsg->lastctx = -1;
-  rmsg->failctx = -1;
+  rmsg->lastctx = CK_CTX_INVALID;
+  rmsg->failctx = CK_CTX_INVALID;
   rmsg->msg = NULL;
   reset_rcv_test (rmsg);
   reset_rcv_fixture (rmsg);
@@ -365,7 +365,7 @@ void rcvmsg_free (RcvMsg *rmsg)
 
 static void rcvmsg_update_ctx (RcvMsg *rmsg, enum ck_result_ctx ctx)
 {
-  if (rmsg->lastctx != -1)
+  if (rmsg->lastctx != CK_CTX_INVALID)
   {
     free(rmsg->fixture_file);
     reset_rcv_fixture (rmsg);
@@ -408,7 +408,7 @@ RcvMsg *punpack (int fdes)
   }
 
   free (obuf);
-  if (rmsg->lastctx == -1) {
+  if (rmsg->lastctx == CK_CTX_INVALID) {
     free (rmsg);
     rmsg = NULL;
   }