* add second sampler: dummy

CMakeLists.txt

@@ -9,6 +9,7 @@ include(GNUInstallDirs)
 
 option(WITH_HARDENING "Enable hardening options" ON)
 option(WITH_TOOLS     "Build library management tools" ON)
+set(SAMPLER "magick" CACHE STRING "Library for sampling")
 
 set(CMAKE_INSTALL_PREFIX "/usr/local")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -pedantic -std=c99")
@@ -20,6 +21,12 @@ if (WITH_HARDENING)
   add_definitions("-D_FORTIFY_SOURCE=2")
 endif ()
 
+if (${SAMPLER} STREQUAL "dummy")
+  set(SAMPLER "dummy")
+else ()
+  set(SAMPLER "magick")
+endif ()
+
 message(STATUS "Project    : ${CNAME} v${VERSION}")
 message(STATUS "Compiler   : ${CMAKE_C_COMPILER} (${CMAKE_C_COMPILER_ID} ${CMAKE_C_COMPILER_VERSION})")
 message(STATUS "- CFLAGS   : ${CMAKE_C_FLAGS}")
@@ -31,6 +38,7 @@ message(STATUS "Build type : ${CMAKE_BUILD_TYPE}")
 message(STATUS "Options:")
 message(STATUS "- WITH_HARDENING : ${WITH_HARDENING}")
 message(STATUS "- WITH_TOOLS     : ${WITH_TOOLS}")
+message(STATUS "- SAMPLER        : ${SAMPLER}")
 
 add_subdirectory("src")
 add_subdirectory("tests")

src/CMakeLists.txt

@@ -1,8 +1,14 @@
-set(LIB_SOURCES "database.c" "bitmap.c")
+set(LIB_SOURCES "database.c" "bitmap.c" "samplers/${SAMPLER}.c")
-set(SAMPLER "magick") # TODO: GD2
 
 add_library("simdb" SHARED ${LIB_SOURCES})
 set_property(TARGET "simdb" PROPERTY SONAME ${VERSION})
+
+if (${SAMPLER} STREQUAL "magick")
+  find_package(ImageMagick COMPONENTS MagickCore MagickWand)
+  target_link_libraries("simdb" ${ImageMagick_MagickCore_LIBRARY})
+  target_link_libraries("simdb" ${ImageMagick_MagickWand_LIBRARY})
+endif ()
+
 install(TARGETS "simdb" LIBRARY DESTINATION "lib")
 
 if (WITH_TOOLS)
@@ -13,11 +19,11 @@ if (WITH_TOOLS)
   target_link_libraries("simdb-query" "simdb")
   install(TARGETS "simdb-query" RUNTIME DESTINATION "bin")
 
-  find_package(ImageMagick COMPONENTS MagickCore MagickWand)
+  if (${SAMPLER} STREQUAL "dummy")
-
+    message(STATUS "Sampler set to 'dummy', not building 'simdb-write' tool")
-  add_executable("simdb-write" "simdb-write.c" "samplers/${SAMPLER}.c")
+  else ()
-  target_link_libraries("simdb-write" "simdb")
+    add_executable("simdb-write" "simdb-write.c")
-  target_link_libraries("simdb-write" ${ImageMagick_MagickCore_LIBRARY})
+    target_link_libraries("simdb-write" "simdb")
-  target_link_libraries("simdb-write" ${ImageMagick_MagickWand_LIBRARY})
+    install(TARGETS "simdb-write" RUNTIME DESTINATION "bin")
-  install(TARGETS "simdb-write" RUNTIME DESTINATION "bin")
+  endif ()
 endif ()

src/samplers/dummy.c

@@ -0,0 +1,13 @@
+#include "../common.h"
+#include "../simdb.h"
+
+bool
+simdb_record_create(simdb_rec_t * const rec, const char * const source) {
+  assert(rec != NULL);
+  assert(source != NULL);
+
+  (void)(rec);
+  (void)(source);
+
+  return false;
+}

src/simdb-write.c

@@ -81,7 +81,7 @@ int main(int argc, char **argv)
     case add :
       if (rec.num == 0 || sample == NULL)
         usage(EXIT_FAILURE);
-      if (simdb_record_create(&rec, sample) != 0) {
+      if (!simdb_record_create(&rec, sample)) {
         fprintf(stderr, "sampler failure\n");
         exit(EXIT_FAILURE);
       }