minor API update

diff --git a/dictBuilder/dibcli.c b/dictBuilder/dibcli.c
index 50369c2206de360a9cf0b42d45930244936038fc..ce4a7ac737ba7bdd2313019ad701c38674f5ce24 100644 (file)
--- a/dictBuilder/dibcli.c
+++ b/dictBuilder/dibcli.c
@@ -247,8 +247,8 @@ int main(int argCount, const char** argv)
     if (filenameIdx==0) return badusage(programName);
 
     /* building ... */
-    DiB_setDisplayLevel(displayLevel);
-    operationResult = DiB_trainFiles(dictFileName, maxDictSize, filenameTable, filenameIdx, selectionLevel);
+    DiB_setNotificationLevel(displayLevel);
+    operationResult = DiB_trainDictionary(dictFileName, maxDictSize, selectionLevel, filenameTable, filenameIdx);
 
     if (main_pause) waitEnter();
     free((void*)filenameTable);

diff --git a/dictBuilder/dictBuilder.c b/dictBuilder/dictBuilder.c
index ed41d7c5199535cfde2084e93b83586fec21d2b6..fa14ed2ca09487e8319b63143c982c044f8475a2 100644 (file)
--- a/dictBuilder/dictBuilder.c
+++ b/dictBuilder/dictBuilder.c
@@ -98,8 +98,8 @@ static const size_t maxMemory = (sizeof(size_t)==4)  ?  (2 GB - 64 MB) : (size_t
 ***************************************/
 #define DISPLAY(...)         fprintf(stderr, __VA_ARGS__)
 #define DISPLAYLEVEL(l, ...) if (g_displayLevel>=l) { DISPLAY(__VA_ARGS__); }
-static unsigned g_displayLevel = 2;   /* 0 : no display;   1: errors;   2: default;  4: full information */
-void DiB_setDisplayLevel(unsigned l) { g_displayLevel=l; }
+static unsigned g_displayLevel = 0;   /* 0 : no display;   1: errors;   2: default;  4: full information */
+void DiB_setNotificationLevel(unsigned l) { g_displayLevel=l; }
 
 #define DISPLAYUPDATE(l, ...) if (g_displayLevel>=l) { \
             if (DiB_GetMilliSpan(g_time) > refreshRate)  \
@@ -833,9 +833,8 @@ static void DiB_saveDict(const char* dictFileName,
 }
 
 
-int DiB_trainFiles(const char* dictFileName, unsigned maxDictSize,
-                   const char** fileNamesTable, unsigned nbFiles,
-                   unsigned shiftRatio)
+int DiB_trainDictionary(const char* dictFileName, unsigned maxDictSize, unsigned shiftRatio,
+                   const char** fileNamesTable, unsigned nbFiles)
 {
     void* srcBuffer;
     size_t benchedSize;

diff --git a/dictBuilder/dictBuilder.h b/dictBuilder/dictBuilder.h
index 76efed293110987cb213edfe697ccd437c4b153b..74fa2b0c069f1eaa43761b169e38ef6dcfa8444b 100644 (file)
--- a/dictBuilder/dictBuilder.h
+++ b/dictBuilder/dictBuilder.h
@@ -23,7 +23,10 @@
     - ztsd public forum : https://groups.google.com/forum/#!forum/lz4c
 */
 
-/* *************************************
+/* This library is designed for a single-threaded console application.
+*  It abruptly exits (exit() function) when it encounters an error condition. */
+
+/*-*************************************
 *  Version
 ***************************************/
 #define DiB_VERSION_MAJOR    0    /* for breaking interface changes  */
@@ -33,12 +36,21 @@
 unsigned DiB_versionNumber (void);
 
 
-/* *************************************
+/*-*************************************
 *  Main functions
 ***************************************/
-int DiB_trainFiles(const char* dictFileName, unsigned maxDictSize,
-                   const char** fileNamesTable, unsigned nbFiles,
-                   unsigned selectionLevel);
+/*! DiB_trainDictionary
+    Train a dictionary from a set of files provided by @fileNamesTable
+    Resulting dictionary is written in file @dictFileName
+    @result : 0 if fine
+*/
+int DiB_trainDictionary(const char* dictFileName, unsigned maxDictSize, unsigned selectivityLevel,
+                        const char** fileNamesTable, unsigned nbFiles);
 
 
-void DiB_setDisplayLevel(unsigned l);
+/*! DiB_setNotificationLevel
+    Set amount of notification to be displayed on the console.
+    0 = no console notification (default).
+    Note : not thread-safe (use a global constant)
+*/
+void DiB_setNotificationLevel(unsigned l);