Changeset 9b20126 in mainline for uspace/lib/pcut/src/assert.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/assert.c (modified) (2 diffs)

uspace/lib/pcut/src/assert.c

@@ -35 +35 @@
  */
 
+/** We need _BSD_SOURCE because of vsnprintf() when compiling under C89. */
+#define _BSD_SOURCE
+
 #include "internal.h"
 #include <setjmp.h>
@@ -52 +55 @@
 static int message_buffer_index = 0;
 
-/** Announce that assertion failed.
- *
- * @warning This function may not return.
- *
- * @param fmt printf-style formatting string.
- *
- */
-void pcut_failed_assertion_fmt(const char *fmt, ...) {
+void pcut_failed_assertion_fmt(const char *filename, int line, const char *fmt, ...) {
+        va_list args;
         char *current_buffer = message_buffer[message_buffer_index];
+        size_t offset = 0;
         message_buffer_index = (message_buffer_index + 1) % MESSAGE_BUFFER_COUNT;
 
-        va_list args;
-        va_start(args, fmt);
-        vsnprintf(current_buffer, MAX_MESSAGE_LENGTH, fmt, args);
-        va_end(args);
+        snprintf(current_buffer, MAX_MESSAGE_LENGTH, "%s:%d: ", filename, line);
+        offset = pcut_str_size(current_buffer);
+
+        if (offset + 1 < MAX_MESSAGE_LENGTH) {
+                va_start(args, fmt);
+                vsnprintf(current_buffer + offset, MAX_MESSAGE_LENGTH - offset, fmt, args);
+                va_end(args);
+        }
 
         pcut_failed_assertion(current_buffer);