Cleanup

Author: mleleszi

libc/src/stdio/baremetal/printf.cpp

@@ -47,7 +47,7 @@ LLVM_LIBC_FUNCTION(int, printf, (const char *__restrict format, ...)) {
   int flushval = wb.overflow_write("");
   if (flushval != printf_core::WRITE_OK)
     retval = flushval;
-
+    
   return retval;
 }
 

libc/src/stdio/baremetal/vprintf.cpp

@@ -22,7 +22,7 @@ namespace LIBC_NAMESPACE_DECL {
 namespace {
 
 LIBC_INLINE int stdout_write_hook(cpp::string_view new_str, void *) {
-  write_to_stdout(new_str);
+  write_to_stdout(new_str); 
   return printf_core::WRITE_OK;
 }
 
@@ -40,7 +40,7 @@ LLVM_LIBC_FUNCTION(int, vprintf,
       buffer, BUFF_SIZE, &stdout_write_hook, nullptr);
   printf_core::Writer<printf_core::WriteMode::FLUSH_TO_STREAM> writer(wb);
 
-  int retval = printf_core::printf_main(&writer, format, args);
+  int retval = printf_core::printf_main(&writer, format, args); // TODO baremetal stuff
 
   int flushval = wb.overflow_write("");
   if (flushval != printf_core::WRITE_OK)

libc/src/stdio/printf_core/core_structs.h

@@ -31,7 +31,7 @@ struct PrintfResult {
 
   constexpr bool has_error() { return error != 0; }
 
-  constexpr operator size_t() { return value; }
+  // constexpr operator size_t() { return value; }
 };
 
 // These length modifiers match the length modifiers in the format string, which

libc/src/stdio/printf_core/printf_main.h

@@ -30,9 +30,9 @@ PrintfResult printf_main(Writer<write_mode> *writer, const char *__restrict str,
        !cur_section.raw_string.empty();
        cur_section = parser.get_next_section()) {
     if (cur_section.has_conv)
-      result = convert(writer, cur_section);
+      result = convert(writer, cur_section); // look at usages
     else
-      result = writer->write(cur_section.raw_string);
+      result = writer->write(cur_section.raw_string); // look at usages
 
     if (result < 0)
       return {0, -result};

libc/src/time/strftime_core/strftime_main.h

@@ -36,7 +36,7 @@ int strftime_main(printf_core::Writer<write_mode> *writer,
       return result;
   }
 
-  return writer->get_chars_written();
+  return static_cast<int>(writer->get_chars_written());
 }
 
 } // namespace strftime_core

libc/test/src/stdio/fprintf_test.cpp

@@ -91,13 +91,14 @@ TEST(LlvmLibcFPrintfTest, WriteToFile) {
   ASSERT_EQ(printf_test::fclose(file), 0);
 }
 
-struct NoopStream {};
-
-static ssize_t noop_write(void *, const char *, size_t size) { return size; }
-
 TEST(LlvmLibcFPrintfTest, CharsWrittenOverflow) {
+  struct NoopStream {};
+  auto noop_write = [](void *cookie, const char *buf, size_t size) -> ssize_t {
+    return size;
+  };
+
   NoopStream stream;
-  cookie_io_functions_t funcs = {nullptr, &noop_write, nullptr, nullptr};
+  cookie_io_functions_t funcs = {nullptr, +noop_write, nullptr, nullptr};
   ::FILE *file = printf_test::fopencookie(&stream, "w", funcs);
   ASSERT_NE(file, nullptr);