* Pass an adjusted line number to eprintf when the error

  being reported is based on the result of another function.
* Name the function that failed in these cases.
* Add FIXME re: colons at the end of system error messages

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

diff --git a/src/check_error.c b/src/check_error.c
index 6ad0481894a447ec64b46384ba5b74343aaab164..5da8fb6718c7bd6229cc29bd39819441938d2b15 100644 (file)
--- a/src/check_error.c
+++ b/src/check_error.c
@@ -29,6 +29,7 @@
 #include "check_error.h"
 
 
+/* FIXME: including a colon at the end is a bad way to indicate an error */
 void eprintf (const char *fmt, const char *file, int line, ...)
 {
   va_list args;
@@ -52,7 +53,7 @@ void *emalloc (size_t n)
   void *p;
   p = malloc(n);
   if (p == NULL)
-    eprintf("malloc of %u bytes failed:", __FILE__, __LINE__, n);
+    eprintf("malloc of %u bytes failed:", __FILE__, __LINE__ - 2, n);
   return p;
 }
 
@@ -61,6 +62,6 @@ void *erealloc (void * ptr, size_t n)
   void *p;
   p = realloc (ptr, n);
   if (p == NULL)
-    eprintf("realloc of %u bytes failed:", __FILE__, __LINE__, n);
+    eprintf("realloc of %u bytes failed:", __FILE__, __LINE__ - 2, n);
   return p;
 }

diff --git a/src/check_log.c b/src/check_log.c
index edb5cb0165e5b58b3078b3626c508d4e401e7256..2cb9a77f143ad49e9320c433476667fce358b6d1 100644 (file)
--- a/src/check_log.c
+++ b/src/check_log.c
@@ -267,7 +267,7 @@ FILE *srunner_open_lfile (SRunner *sr)
   if (srunner_has_log (sr)) {
     f = fopen(sr->log_fname, "w");
     if (f == NULL)
-      eprintf ("Could not open log file %s:", __FILE__, __LINE__,
+      eprintf ("Error in call to fopen while opening log file %s:", __FILE__, __LINE__ - 2,
               sr->log_fname);
   }
   return f;
@@ -279,7 +279,7 @@ FILE *srunner_open_xmlfile (SRunner *sr)
   if (srunner_has_xml (sr)) {
     f = fopen(sr->xml_fname, "w");
     if (f == NULL)
-      eprintf ("Could not open xml file %s:", __FILE__, __LINE__,
+      eprintf ("Error in call to fopen while opening xml file %s:", __FILE__, __LINE__ - 2,
               sr->xml_fname);
   }
   return f;
@@ -314,7 +314,7 @@ void srunner_end_logging (SRunner *sr)
     if (lg->close) {
       rval = fclose (lg->lfile);
       if (rval != 0)
-       eprintf ("Error closing log file:", __FILE__, __LINE__);
+       eprintf ("Error in call to fclose while closing log file:", __FILE__, __LINE__ - 2);
     }
     free (lg);
   }

diff --git a/src/check_msg.c b/src/check_msg.c
index 34c88f1b8832e8aa75607468ad1f43d1e70385b3..81cdf0fc2b28e0b5f8edcf360f838cc41c433e9f 100644 (file)
--- a/src/check_msg.c
+++ b/src/check_msg.c
@@ -111,7 +111,7 @@ TestResult *receive_test_result (int waserror)
 
   fp = get_pipe();
   if (fp == NULL)
-    eprintf ("Couldn't find pipe",__FILE__, __LINE__);
+    eprintf ("Error in call to get_pipe",__FILE__, __LINE__ - 2);
   rewind(fp);
   rmsg = punpack (fileno(fp));
   teardown_pipe();

diff --git a/src/check_pack.c b/src/check_pack.c
index 1c2d68994e87e3eed011b40012ea449167f3800d..81b5de400ab07c518f240f0f0945e84df0f02636 100644 (file)
--- a/src/check_pack.c
+++ b/src/check_pack.c
@@ -259,7 +259,7 @@ void ppack (int fdes, enum ck_msg_type type, CheckMsg *msg)
   n = pack (type, &buf, msg);
   r = write (fdes, buf, n);
   if (r == -1)
-    eprintf ("Error in ppack:",__FILE__,__LINE__);
+    eprintf ("Error in call to write:", __FILE__, __LINE__ - 2);
 
   free (buf);
 }
@@ -279,7 +279,7 @@ static int read_buf (int fdes, char **buf)
     if (n == 0)
       break;
     if (n == -1)
-      eprintf ("Error in read_buf:", __FILE__, __LINE__);
+      eprintf ("Error in call to read:", __FILE__, __LINE__ - 4);
 
     nread += n;
     size *= grow;
@@ -299,7 +299,7 @@ static int get_result (char *buf, RcvMsg *rmsg)
 
   n = upack (buf, &msg, &type);
   if (n == -1)
-    eprintf ("Error in upack", __FILE__, __LINE__);
+    eprintf ("Error in call to upack", __FILE__, __LINE__ - 2);
   
   if (type == CK_MSG_CTX) {
     CtxMsg *cmsg = (CtxMsg *) &msg;

diff --git a/src/check_run.c b/src/check_run.c
index ec8c6255ed5a948999f6d7081b4d2bbb013c8374..611e8d0958b9784215f52f3c9915aa2821c73e39 100644 (file)
--- a/src/check_run.c
+++ b/src/check_run.c
@@ -426,7 +426,7 @@ static TestResult *tcase_run_tfun_fork (SRunner *sr, TCase *tc, TF *tfun, int i)
   int status = 0;
   pid = fork();
   if (pid == -1)
-    eprintf("Unable to fork:",__FILE__,__LINE__);
+    eprintf("Error in call to fork:", __FILE__, __LINE__ - 2);
   if (pid == 0) {
     setpgid(0, 0);
     group_pid = getpgrp();