X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fbase%2FFBaseResult.cpp;h=65f976b18e71326670240a48b7893f8879f2bd90;hb=8f5f7c07039d34a2f4ccb9836ace7f7e0d54d08a;hp=254343ec2740e7fe9872ec4a66653d52ce6c08d2;hpb=63c3ff04cdb9041ac5765c7196eaaeb28ca568d8;p=platform%2Fframework%2Fnative%2Fappfw.git diff --git a/src/base/FBaseResult.cpp b/src/base/FBaseResult.cpp index 254343e..65f976b 100644 --- a/src/base/FBaseResult.cpp +++ b/src/base/FBaseResult.cpp @@ -18,7 +18,6 @@ * @file FBaseResult.cpp * @brief This is the implementation file of Result class. */ - #include #include #include @@ -82,7 +81,7 @@ const char* __errTable1100[] = "E_ALREADY_OPENED", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1103)) "E_AUTHENTICATION", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1104)) "E_APP_NOT_INSTALLED", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1105)) - "E_ALREADY_SET", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1106)) + "E_ALREADY_SET", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1106)) "E_ACCOUNT_ALREADY_EXIST", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1107)) "E_ACCOUNT_NOT_FOUND" //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1108)) }; @@ -94,7 +93,7 @@ const char* __errTable1300[] = "E_CONNECTION_FAILED", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1302)) "E_CONNECTION_RESET", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1303)) "E_CREDENTIAL_EXPIRED", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1304)) - "E_CERTIFICATE_VERIFICATION_FAILED", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1305)) + "E_CERTIFICATE_VERIFICATION_FAILED", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1305)) "E_CONTEXT_UNAVAILABLE" //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1306)) }; @@ -112,7 +111,7 @@ const char* __errTable1400[] = "E_DNS", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1409)) "E_DNS_NOT_FOUND", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1410)) "E_DATA_NOT_ENOUGH", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1411)) - "E_DISPLAY_RIGHT_VIOLATED" //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1412)) + "E_DISPLAY_RIGHT_VIOLATED" //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(1412)) }; const char* __errTable1500[] = @@ -231,7 +230,8 @@ const char* __errTable2500[] = "E_OUT_OF_MEMORY", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2506)) "E_OUT_OF_RANGE", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2507)) "E_OVERFLOW", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2508)) - "E_OPENGL_ERROR" //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2509)) + "E_OPENGL_ERROR", //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2509)) + "E_OBJ_NOT_REGISTERED" //(ERR_SRC_FRAMEWORK + SET_E_CAUSE(2510)) }; const char* __errTable2600[] = @@ -361,64 +361,68 @@ GetErrorMessage(result value) } #define MAX_CHECK_COUNT 100 -_OSP_EXPORT_ result TransExceptionsExclusiveInternal(result r, result e, int num,...); +_OSP_EXPORT_ result TransExceptionsExclusiveInternal(result r, result e, int num, ...); -_OSP_EXPORT_ result TransExceptionsInclusiveInternal(result r, result e, int num,...); +_OSP_EXPORT_ result TransExceptionsInclusiveInternal(result r, result e, int num, ...); -result +result TransExceptionsExclusiveInternal(result r, result e, int num, ...) { va_list ap; bool ref = false; int count = 0; - if(r == E_SUCCESS) + if (r == E_SUCCESS) + { return r; + } - va_start(ap,num); - for(count; count < num; count++ ) + va_start(ap, num); + for (; count < num; count++) { if (r == va_arg(ap, result)) - { + { ref = true; break; - } + } } va_end(ap); - if(ref) + if (ref) + { return r; - - return e; + } + + return e; } -result +result TransExceptionsInclusiveInternal(result r, result e, int num, ...) { va_list ap; bool ref = false; int count = 0; - - if(r == E_SUCCESS) + + if (r == E_SUCCESS) + { return r; + } - va_start(ap,num); - for(count; count < num ; count++ ) + va_start(ap, num); + for (; count < num; count++) { if (r == va_arg(ap, result)) - { + { ref = true; break; - } + } } va_end(ap); - if(ref) + if (ref) + { return e; - - return r; - -} - - + } + return r; +}