Cleanup the C API

Author: vitaut

CMakeLists.txt

@@ -383,6 +383,14 @@ target_include_directories(fmt-header-only
   $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
   $<INSTALL_INTERFACE:${FMT_INC_DIR}>)
 
+add_library(fmt-c STATIC src/fmt-c.cc)
+target_compile_features(fmt-c INTERFACE c_std_11)
+if (MSVC)
+  target_compile_options(fmt-c PUBLIC /Zc:preprocessor)
+endif ()
+target_link_libraries(fmt-c PUBLIC fmt::fmt)
+add_library(fmt::fmt-c ALIAS fmt-c)
+
 # Install targets.
 if (FMT_INSTALL)
   include(CMakePackageConfigHelpers)
@@ -422,7 +430,7 @@ if (FMT_INSTALL)
     ${project_config}
     INSTALL_DESTINATION ${FMT_CMAKE_DIR})
 
-  set(INSTALL_TARGETS fmt fmt-header-only)
+  set(INSTALL_TARGETS fmt fmt-header-only fmt-c)
 
   set(INSTALL_FILE_SET)
   if (FMT_USE_CMAKE_MODULES)
@@ -533,51 +541,3 @@ if (FMT_MASTER_PROJECT AND EXISTS ${gitignore})
   set(CPACK_RESOURCE_FILE_README ${PROJECT_SOURCE_DIR}/README.md)
   include(CPack)
 endif ()
-
-# C API Wrapper
-add_library(fmt_c STATIC src/fmt-c.cc)
-
-target_compile_features(fmt_c PUBLIC cxx_std_11)
-target_link_libraries(fmt_c PUBLIC fmt::fmt)
-
-target_include_directories(fmt_c PUBLIC
-        $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/include>
-        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-)
-
-set_target_properties(fmt_c PROPERTIES
-        VERSION ${FMT_VERSION}
-        SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}
-        DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}"
-        C_VISIBILITY_PRESET default
-        CXX_VISIBILITY_PRESET hidden
-)
-
-add_library(fmt::fmt_c ALIAS fmt_c)
-if(FMT_INSTALL)
-  install(TARGETS fmt_c
-          EXPORT fmt-targets
-          ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
-  install(FILES include/fmt/fmt-c.h
-          DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/fmt
-)
-endif()
-
-if(FMT_TEST)
-  enable_language(C)
-  message(STATUS "Adding C API test executable")
-
-  add_executable(test-c-api test/test_c.c)
-  target_link_libraries(test-c-api PRIVATE fmt::fmt_c)
-  set_target_properties(test-c-api PROPERTIES
-          C_STANDARD 11
-          C_STANDARD_REQUIRED ON
-  )
-  if(MSVC)
-    target_compile_options(test-c-api PRIVATE /Zc:preprocessor)
-  endif()
-
-  add_test(NAME c-api-test COMMAND test-c-api)
-endif()
-

test/CMakeLists.txt

@@ -242,3 +242,8 @@ if (FMT_CUDA_TEST)
     add_test(NAME cuda-test COMMAND fmt-in-cuda-test)
   endif ()
 endif ()
+
+enable_language(C)
+add_executable(c-test c-test.c)
+target_link_libraries(c-test PRIVATE fmt::fmt-c)
+add_test(NAME c-test COMMAND c-test)

test/c-test.c

@@ -0,0 +1,92 @@
+// Formatting library for C++ - the C API tests
+//
+// Copyright (c) 2012 - present, Victor Zverovich
+// All rights reserved.
+//
+// For the license information refer to format.h.
+
+#include "fmt/fmt-c.h"
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#define ASSERT_STR_EQ(actual, expected)                                   \
+  do {                                                                    \
+    if (strcmp(actual, expected) != 0) {                                  \
+      fprintf(stderr,                                                     \
+              "\nAssertion failed:\n  Expected: \"%s\"\n  Got: \"%s\"\n", \
+              expected, actual);                                          \
+      exit(1);                                                            \
+    }                                                                     \
+  } while (0)
+
+#define ASSERT_INT_EQ(actual, expected)                                   \
+  do {                                                                    \
+    if ((actual) != (expected)) {                                         \
+      fprintf(stderr, "\nAssertion failed:\n  Expected: %d\n  Got: %d\n", \
+              expected, actual);                                          \
+      exit(1);                                                            \
+    }                                                                     \
+  } while (0)
+
+static inline int fmt_vformat_cstr(char* buf, size_t size, int result) {
+  if (result >= 0 && (size_t)result < size)
+    buf[result] = '\0';
+  else if (size > 0)
+    buf[size - 1] = '\0';
+  return result;
+}
+
+#define fmt_format_cstr(buf, size, ...) \
+  fmt_vformat_cstr(buf, size, fmt_format(buf, size, __VA_ARGS__))
+
+void test_types(void) {
+  char buf[100];
+
+  fmt_format_cstr(buf, sizeof(buf), "{}", 42);
+  ASSERT_STR_EQ(buf, "42");
+
+  fmt_format_cstr(buf, sizeof(buf), "{}", 123u);
+  ASSERT_STR_EQ(buf, "123");
+
+  fmt_format_cstr(buf, sizeof(buf), "{}", (bool)true);
+  ASSERT_STR_EQ(buf, "true");
+
+  fmt_format_cstr(buf, sizeof(buf), "{}", (char)'x');
+  ASSERT_STR_EQ(buf, "x");
+
+  fmt_format_cstr(buf, sizeof(buf), "{}", 1.2f);
+  ASSERT_STR_EQ(buf, "1.2");
+
+  fmt_format_cstr(buf, sizeof(buf), "{}", 3.14159);
+  ASSERT_STR_EQ(buf, "3.14159");
+
+  fmt_format_cstr(buf, sizeof(buf), "{}", 1.2l);
+  ASSERT_STR_EQ(buf, "1.2");
+
+  fmt_format_cstr(buf, sizeof(buf), "{}", "foo");
+  ASSERT_STR_EQ(buf, "foo");
+
+  fmt_format_cstr(buf, sizeof(buf), "{}", (void*)0x12345678);
+  ASSERT_STR_EQ(buf, "0x12345678");
+}
+
+void test_zero_arguments(void) {
+  char buf[100];
+  int ret = fmt_format_cstr(buf, sizeof(buf), "No arguments");
+  ASSERT_STR_EQ(buf, "No arguments");
+}
+
+void test_buffer_size_query(void) {
+  int size = fmt_format(NULL, 0, "Test string: {}", 42);
+  ASSERT_INT_EQ(size, 15);
+}
+
+int main(void) {
+  printf("Running C API tests\n");
+  test_types();
+  test_zero_arguments();
+  test_buffer_size_query();
+  printf("C API tests passed\n");
+}