Imported Upstream version 0.8~alpha1

[platform/upstream/syncevolution.git] / src / client-api / src / c++ / common / spds / DataTransformerFactory.cpp

diff --git a/src/client-api/src/c++/common/spds/DataTransformerFactory.cpp b/src/client-api/src/c++/common/spds/DataTransformerFactory.cpp
index 8f494e5..1bab197 100644 (file)
--- a/src/client-api/src/c++/common/spds/DataTransformerFactory.cpp
+++ b/src/client-api/src/c++/common/spds/DataTransformerFactory.cpp
@@ -38,13 +38,17 @@
 #include "spds/B64Decoder.h"
 #include "spds/DESEncoder.h"
 #include "spds/DESDecoder.h"
+#include "base/globalsdef.h"
+
+USE_NAMESPACE
 
 DataTransformer* DataTransformerFactory::getEncoder(const char* name) {
     DataTransformer* ret = NULL;
 
-    if (isSupportedEncoder(name) == FALSE) {
-        lastErrorCode = ERR_DT_UNKNOWN;
-        sprintf (lastErrorMsg, ERRMSG_DT_UNKNOWN, name);
+    if (isSupportedEncoder(name) == false) {
+        //lastErrorCode = ERR_DT_UNKNOWN;
+        //sprintf (lastErrorMsg, ERRMSG_DT_UNKNOWN, name);
+        setErrorF(ERR_DT_UNKNOWN, ERRMSG_DT_UNKNOWN, name);
         goto exit;
     } else if (strcmp(name, DT_B64) == 0) {
         //
@@ -66,9 +70,10 @@ exit:
 DataTransformer* DataTransformerFactory::getDecoder(const char* name) {
     DataTransformer* ret = NULL;
 
-    if (isSupportedDecoder(name) == FALSE) {
-        lastErrorCode = ERR_DT_UNKNOWN;
-        sprintf (lastErrorMsg, ERRMSG_DT_UNKNOWN, name);
+    if (isSupportedDecoder(name) == false) {
+        //lastErrorCode = ERR_DT_UNKNOWN;
+        //sprintf (lastErrorMsg, ERRMSG_DT_UNKNOWN, name);
+        setErrorF(ERR_DT_UNKNOWN, ERRMSG_DT_UNKNOWN, name);
         goto exit;
     } else if (strcmp(name, DT_B64) == 0) {
         //
@@ -87,13 +92,13 @@ exit:
     return ret;
 }
 
-BOOL DataTransformerFactory::isSupportedEncoder(const char* name) {
+bool DataTransformerFactory::isSupportedEncoder(const char* name) {
     char* t = new char[strlen(name)+2];
 
     sprintf(t, "%s;", name);
     //strcpy(t, name); strcat(t, ";");
 
-    BOOL ret = (strstr(DF_FORMATTERS, t) != NULL);
+    bool ret = (strstr(DF_FORMATTERS, t) != NULL);
 
     delete [] t;
 
@@ -101,7 +106,7 @@ BOOL DataTransformerFactory::isSupportedEncoder(const char* name) {
 
 }
 
-BOOL DataTransformerFactory::isSupportedDecoder(const char* name) {
+bool DataTransformerFactory::isSupportedDecoder(const char* name) {
     //
     // Currently, same encoders/decoders are supported
     //