Add #define for US_PER_SEC, to avoid magic numbers

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

diff --git a/src/check_impl.h b/src/check_impl.h
index ec8bda23571878bc5eb73b9cbb1c5d4fced9be3a..1f59ee1988b533f749c3645f24ec3838ad341522 100644 (file)
--- a/src/check_impl.h
+++ b/src/check_impl.h
@@ -26,9 +26,11 @@
    Include stdio.h, time.h, & list.h before this header
 */
 
+#define US_PER_SEC 1000000
+
 /** calculate the difference in useconds out of two "struct timespec"s */
 #define DIFF_IN_USEC(begin, end) \
-  ( (((end).tv_sec - (begin).tv_sec) * 1000000) + \
+  ( (((end).tv_sec - (begin).tv_sec) * US_PER_SEC) + \
     ((end).tv_nsec/1000) - ((begin).tv_nsec/1000) )
 
 typedef struct TF {

diff --git a/src/check_log.c b/src/check_log.c
index 5c02f47cd3cd3fde530d1fe13790c58783adca1b..49eb0d85042535dc46a545e7d6c89a5e0a1f77cf 100644 (file)
--- a/src/check_log.c
+++ b/src/check_log.c
@@ -282,7 +282,7 @@ void xml_lfun (SRunner *sr CK_ATTRIBUTE_UNUSED, FILE *file, enum print_output pr
       clock_gettime(check_get_clockid(), &ts_end);
       duration = DIFF_IN_USEC(ts_start, ts_end);
       fprintf(file, "  <duration>%u.%06u</duration>\n",
-          duration / 1000000, duration % 1000000);
+          duration / US_PER_SEC, duration % US_PER_SEC);
       fprintf(file, "</testsuites>\n");
     }
     break;