Changeset 4b54bd9 in mainline for uspace/lib/pcut/src/internal.h

Timestamp:

2018-09-12T13:23:03Z (7 years ago)

Author:

Vojtech Horky <vojtech.horky@…>

Branches:

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

Children:

3da0ee4

Parents:

275530a4

Message:

Update PCUT to latest revision

File:

• uspace/lib/pcut/src/internal.h (modified) (6 diffs)

uspace/lib/pcut/src/internal.h

@@ -35 +35 @@
 
 #include <pcut/pcut.h>
+
+#pragma warning(push, 0)
 #include <stdlib.h>
+#pragma warning(pop)
 
 
@@ -48 +51 @@
  */
 #ifdef PCUT_DEBUG_BUILD
+#pragma warning(push, 0)
 #include <stdio.h>
+#pragma warning(pop)
 #define PCUT_DEBUG_INTERNAL(msg, ...) \
         fprintf(stderr, "[PCUT %s:%d]: " msg "%s", __FILE__, __LINE__, __VA_ARGS__)
@@ -78 +83 @@
  */
 #define PCUT_RUN_MODE_SINGLE 2
-
-/*
- * Use sprintf_s in Windows but only with Microsoft compiler.
- * Namely, let MinGW use snprintf.
- */
-#if (defined(__WIN64) || defined(__WIN32) || defined(_WIN32)) && defined(_MSC_VER)
-#define snprintf sprintf_s
-#endif
 
 extern int pcut_run_mode;
@@ -125 +122 @@
         /** Test completed. */
         void (*test_done)(pcut_item_t *, int, const char *, const char *,
-            const char *);
+                const char *);
 };
 
@@ -135 +132 @@
 void pcut_report_test_start(pcut_item_t *test);
 void pcut_report_test_done(pcut_item_t *test, int outcome,
-    const char *error_message, const char *teardown_error_message,
-    const char *extra_output);
+                const char *error_message, const char *teardown_error_message,
+                const char *extra_output);
 void pcut_report_test_done_unparsed(pcut_item_t *test, int outcome,
-    const char *unparsed_output, size_t unparsed_output_size);
+                const char *unparsed_output, size_t unparsed_output_size);
 void pcut_report_done(void);
 
@@ -187 +184 @@
 char *pcut_str_find_char(const char *haystack, const char needle);
 
+/** Format string to a buffer.
+ *
+ */
+int pcut_snprintf(char *dest, size_t size, const char *format, ...);
 
 #endif