Changeset 9b20126 in mainline for uspace/lib/pcut/src/report/report.c

Timestamp:

2014-09-19T08:23:01Z (10 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

c85a57f

Parents:

15d0046

Message:

Update PCUT to newest version

File:

• uspace/lib/pcut/src/report/report.c (modified) (5 diffs)

uspace/lib/pcut/src/report/report.c

@@ -44 +44 @@
  *
  * @param op Operation to be called on the pcut_report_ops_t.
+ * @param ... Arguments to the operation.
  */
 #define REPORT_CALL(op, ...) \
         if ((report_ops != NULL) && (report_ops->op != NULL)) report_ops->op(__VA_ARGS__)
+
+/** Call a report function if it is available.
+ *
+ * @param op Operation to be called on the pcut_report_ops_t.
+ */
+#define REPORT_CALL_NO_ARGS(op) \
+                if ((report_ops != NULL) && (report_ops->op != NULL)) report_ops->op()
 
 /** Print error message.
@@ -94 +102 @@
         /* Ensure that we do not read past the full_output. */
         if (full_output[full_output_size - 1] != 0) {
-                // FIXME: can this happen?
+                /* FIXME: can this happen? */
                 return;
         }
 
         while (1) {
+                size_t message_length;
+
                 /* First of all, count number of zero bytes before the text. */
                 size_t cont_zeros_count = 0;
@@ -111 +121 @@
 
                 /* Determine the length of the text after the zeros. */
-                size_t message_length = pcut_str_size(full_output);
+                message_length = pcut_str_size(full_output);
 
                 if (cont_zeros_count < 2) {
                         /* Okay, standard I/O. */
                         if (message_length > stdio_buffer_size) {
-                                // TODO: handle gracefully
+                                /* TODO: handle gracefully */
                                 return;
                         }
@@ -125 +135 @@
                         /* Error message. */
                         if (message_length > error_buffer_size) {
-                                // TODO: handle gracefully
+                                /* TODO: handle gracefully */
                                 return;
                         }
@@ -213 +223 @@
  *
  */
-void pcut_report_done() {
-        REPORT_CALL(done);
-}
-
+void pcut_report_done(void) {
+        REPORT_CALL_NO_ARGS(done);
+}
+