X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f23b0fb864cb60978c1fcfd48d50f62dd054fe31..8f7ec2e4b08cd2b27aa34b2c9fec2af0ad79d53a:/src/xbt/string.cpp diff --git a/src/xbt/string.cpp b/src/xbt/string.cpp index a3d6559e95..45f6348ecd 100644 --- a/src/xbt/string.cpp +++ b/src/xbt/string.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -26,14 +26,13 @@ std::string string_vprintf(const char *fmt, va_list ap) va_copy(ap2, ap); int size = std::vsnprintf(nullptr, 0, fmt, ap2); va_end(ap2); - if (size < 0) - xbt_die("string_vprintf error"); + xbt_assert(size >= 0, "string_vprintf error"); // Allocate the string and format: std::string res; res.resize(size); - if (size != 0 && std::vsnprintf(&res[0], size + 1, fmt, ap) != size) - xbt_die("string_vprintf error"); + if (size != 0) + xbt_assert(std::vsnprintf(&res[0], size + 1, fmt, ap) == size, "string_vprintf error"); return res; }