API Improvements

    - Removed 'rlen' return parameters there not necessary for multibyte encodings
    - Two versions of recode functions: rccRecode -> rccRecode, rccSizedRecode
    - Class Types: CONST, SKIP_SAVELOAD
    - New recode functions: rccToCharset, rccFromCharset
    - More new recode functions: rccRecodeToCharset, rccRecodeFromCharset, rccRecodeCharsets
    - New function: rccGetCompiledConfiguration
    - All warnings are fixed
    - Perform "File Name" search only if there are non ISO8859-1 chars in the name.
    - Do not copy invalid characters, - skip them.
    - Fixed error in rccRecode with 'Recoding Cache' switched On.
    - Strip leading and trailing spaces in rccDB4 get/set

1 files changed, 8 insertions, 6 deletions

diff --git a/src/engine.c b/src/engine.c
index 0ff1aa1..d83fbf7 100644
--- a/src/engine.c
+++ b/src/engine.c
@@ -4,6 +4,7 @@
 #include "internal.h"
 #include "plugin.h"
 #include "rccconfig.h"
+#include "rccenca.h"
 
 #include "engine.h"
 
@@ -15,11 +16,12 @@
 # endif /* RCC_RCD_DYNAMIC */
 #endif /* RCC_RCD_SUPPORT */
 
+#ifdef RCC_RCD_DYNAMIC
 static rcc_library_handle rcd_handle = NULL;
+#endif /* RCC_RCD_DYNAMIC */
 
-rcc_charset_id rccAutoengineRussian(rcc_engine_context ctx, const char *buf, int len) {
+rcc_autocharset_id rccAutoengineRussian(rcc_engine_context ctx, const char *buf, int len) {
 #ifdef RCC_RCD_SUPPORT
-    rcc_charset_id id;
 # ifdef RCC_RCD_DYNAMIC
     if (!rcdGetRussianCharset) return (rcc_charset_id)-1;
 # endif /* RCC_RCD_DYNAMIC */
@@ -30,8 +32,8 @@ rcc_charset_id rccAutoengineRussian(rcc_engine_context ctx, const char *buf, int
 }
 
 
-static int rccRCDLibraryLoad() {
 #ifdef RCC_RCD_DYNAMIC
+static int rccRCDLibraryLoad() {
     if (rcd_handle) return 0;
     
     rcd_handle = rccLibraryOpen(RCC_RCD_LIB);
@@ -46,19 +48,19 @@ static int rccRCDLibraryLoad() {
 # endif /* RCC_DEBUG */
 	return -1;
     }
-#endif /* RCC_RCD_DYNAMIC */
 
     return 0;
 }
+#endif /* RCC_RCD_DYNAMIC */
 
-static void rccRCDLibraryUnload() {
 #ifdef RCC_RCD_DYNAMIC
+static void rccRCDLibraryUnload() {
     if (rcd_handle) {
 	rccLibraryClose(rcd_handle);
 	rcd_handle = NULL;
     }
-#endif /* RCC_RCD_DYNAMIC */
 }
+#endif /* RCC_RCD_DYNAMIC */
 
 int rccEngineInit() {
 #ifdef RCC_RCD_DYNAMIC