UCS/LOG: Fix PR comments

Author: guy-ealey-morag

src/ucs/debug/log.c

@@ -310,6 +310,7 @@ ucs_log_print_multi_line(const char *short_file, int line,
     const char *line_end   = first_line_end;
     char prefix[UCS_LOG_MULTILINE_PREFIX_SIZE];
     char output[UCS_LOG_MULTILINE_OUTPUT_SIZE];
+    size_t remaining_space;
     int ret;
 
     /* Format the log prefix once */
@@ -321,12 +322,12 @@ ucs_log_print_multi_line(const char *short_file, int line,
         ret = snprintf(prefix, sizeof(prefix), UCS_LOG_FMT,
                        UCS_LOG_ARG(short_file, line, level, comp_conf, tv));
     }
-    ucs_assert((ret >= 0) && ((size_t)ret < sizeof(prefix)));
+    ucs_assertv((ret >= 0) && ((size_t)ret < sizeof(prefix)), "ret=%d", ret);
 
     /* Append line by line */
     ucs_assert(line_end != NULL);
     do {
-        size_t remaining_space = sizeof(output) - output_len;
+        remaining_space = sizeof(output) - output_len;
 
         ret = snprintf(output + output_len, remaining_space, "%s%.*s\n", prefix,
                        (int)(line_end - line_start), line_start);
@@ -335,7 +336,7 @@ ucs_log_print_multi_line(const char *short_file, int line,
         if ((size_t)ret >= remaining_space) {
             if (output_len == 0) {
                 /* A single line overflowed the output buffer, should never happen */
-                ucs_fatal("log line is too long");
+                ucs_fatal("log line is too long: %d", ret);
             }
 
             /* Terminate the string at the previous position */

test/gtest/ucs/test_log.cc

@@ -391,8 +391,8 @@ class log_test_multiline : public log_test {
         unsigned marker_num = 0;
         size_t start        = first_newline + 1; /* Skip filename */
         size_t end;
-        while (marker_num < m_num_lines &&
-               (end = log_contents.find('\n', start)) != std::string::npos) {
+        while ((marker_num < m_num_lines) &&
+               ((end = log_contents.find('\n', start)) != std::string::npos)) {
             std::string line   = log_contents.substr(start, end - start);
             std::string marker = "multiline_" + ucs::to_string(marker_num);
 
@@ -432,21 +432,18 @@ UCS_TEST_F(log_test_multiline, multiline_format) {
 
 UCS_TEST_F(log_test_multiline, multiline_long) {
     /* Log a multiline message that exceeds the output buffer size */
-    m_num_lines = 25;
+    m_num_lines = 0;
 
-    std::string padding;
-    padding.assign(128, 'X');
+    std::string padding = " ";
+    padding.append(128, 'X');
 
     std::string message;
-    for (unsigned i = 0; i < m_num_lines; i++) {
-        if (i > 0) {
-            message += "\n";
-        }
-        message += "multiline_" + ucs::to_string(i) + " " + padding;
+    while (message.size() <= 2 * UCS_LOG_MULTILINE_OUTPUT_SIZE + 1) {
+        message += "multiline_" + ucs::to_string(m_num_lines) + padding + "\n";
+        m_num_lines++;
     }
 
-    ASSERT_GT(message.size(),
-              static_cast<size_t>(UCS_LOG_MULTILINE_OUTPUT_SIZE));
+    message.pop_back(); /* Remove the trailing newline */
 
     ucs_info("%s", message.c_str());
 }