X-Git-Url: http://plrg.eecs.uci.edu/git/?a=blobdiff_plain;f=folly%2FSafeAssert.cpp;h=4f2db41a2d4515bbe60b1bf72cea80a748fb5f2c;hb=22d531a8fe503001a51672750dc09daae252fbf6;hp=41cd1aa635d17ffb14d0c0781729433f3ffa7629;hpb=22afce906d7e98d95f8c45c3301072d9fd891d41;p=folly.git

diff --git a/folly/SafeAssert.cpp b/folly/SafeAssert.cpp
index 41cd1aa6..4f2db41a 100644
--- a/folly/SafeAssert.cpp
+++ b/folly/SafeAssert.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,23 +14,26 @@
  * limitations under the License.
  */
 
-#include "folly/SafeAssert.h"
+#include <folly/SafeAssert.h>
 
-#include "folly/Conv.h"
-#include "folly/FileUtil.h"
+#include <folly/Conv.h>
+#include <folly/FileUtil.h>
 
 namespace folly { namespace detail {
 
 namespace {
+void writeStderr(const char* s, size_t len) {
+  writeFull(STDERR_FILENO, s, len);
+}
 void writeStderr(const char* s) {
-  writeFull(STDERR_FILENO, s, strlen(s));
+  writeStderr(s, strlen(s));
 }
 }  // namespace
 
 void assertionFailure(const char* expr, const char* msg, const char* file,
                       unsigned int line, const char* function) {
   writeStderr("\n\nAssertion failure: ");
-  writeStderr(expr);
+  writeStderr(expr + 1, strlen(expr) - 2);
   writeStderr("\nMessage: ");
   writeStderr(msg);
   writeStderr("\nFile: ");
@@ -47,4 +50,3 @@ void assertionFailure(const char* expr, const char* msg, const char* file,
 }
 
 }}  // namespaces
-