Merge "Remove the memory leak on osp-security-service" into tizen_2.2

[platform/framework/native/appfw.git] / inc / FBaseResult.h

diff --git a/inc/FBaseResult.h b/inc/FBaseResult.h
index e10fda5..ddbb41d 100644 (file)
--- a/inc/FBaseResult.h
+++ b/inc/FBaseResult.h
@@ -1,5 +1,4 @@
 //
-// Open Service Platform
 // Copyright (c) 2012 Samsung Electronics Co., Ltd.
 //
 // Licensed under the Apache License, Version 2.0 (the License);
@@ -19,7 +18,7 @@
  * @file               FBaseResult.h
  * @brief              This is the header file for the %Result class.
  *
- * This header file contains the declaration of the %Result class.
+ * This header file contains the declarations of the %Result class.
  */
 #ifndef _FBASE_RESULT_H_
 #define _FBASE_RESULT_H_
@@ -55,41 +54,41 @@ _OSP_EXPORT_ void RegisterErrorTable(unsigned long package, struct ErrorTable* p
 
 _OSP_EXPORT_ const char* GetErrorMessage(result value);
 
-_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, ...);
 
-#define NUMARGS(...)  (sizeof((result[]){0, ##__VA_ARGS__})/sizeof(result)-1)
+#define NUMARGS(...)  (sizeof((result[]){0, ##__VA_ARGS__}) / sizeof(result) - 1)
 
 /**
-* This macro returns translated exception when the checked exception doesn't correspond with the conditional exceptions.
-* In contrast, this macro returns the checked exception if it corresponds with the conditional exceptions. 
+* This macro returns a translated exception when the checked exception does not correspond to the conditional exceptions.
+* In contrast, this macro returns a checked exception if it corresponds to the conditional exceptions.
 *
 * @since 2.0
 *
-* @return         The translated exception 
-* @param[in]   r              The result that will be checked
-* @param[in]   e              The translated exception
-* @param[in]   ...            The list of exceptions that will be excluded in translation process @n
-*                             All other exceptions than this list will be translated into @c e. 
+* @return                                      The translated exception
+* @param[in]   r                       The result that is checked
+* @param[in]   e                       The translated exception
+* @param[in]   ...                     The list of exceptions that are excluded from the translation process @n
+*                                                      All the exceptions other than this list are translated into @c e.
 *
 *
 */
 
 #define TransExceptionsExclusive(r, e, ...)     TransExceptionsExclusiveInternal(r, e, NUMARGS(__VA_ARGS__), __VA_ARGS__)
 
- 
+
 /**
-* This macro returns translated exception when the checked exception corresponds with the conditional exceptions.
-* In contrast, this macro returns the checked exception if it doesn't correspond with the conditional exceptions.
+* This macro returns a translated exception when the checked exception corresponds to the conditional exceptions.
+* In contrast, this macro returns a checked exception if it does not correspond to the conditional exceptions.
 *
 * @since 2.0
 *
-* @return         The translated exception
-* @param[in]   r              The result that will be checked
-* @param[in]   e              The translated exception
-* @param[in]   ...            The list of exceptions that will be included in translation process @n
-*                             All exceptions in this list will be translated into @c e.
+* @return                                      The translated exception
+* @param[in]   r                       The result that is checked
+* @param[in]   e                       The translated exception
+* @param[in]   ...                     The list of exceptions that are included in the translation process @n
+*                                                      All the exceptions in this list are translated into @c e.
 *
 */