remove redundant functions

[platform/framework/native/appfw.git] / src / app / FApp_AppInfo.cpp

diff --git a/src/app/FApp_AppInfo.cpp b/src/app/FApp_AppInfo.cpp
index 9f44c33..3221e86 100644 (file)
--- a/src/app/FApp_AppInfo.cpp
+++ b/src/app/FApp_AppInfo.cpp
@@ -44,13 +44,13 @@ using namespace Tizen::Base::Runtime;
 extern "C"
 {
 void _OSP_EXPORT_
-InitAppInfo(const char* appId, const char* svcId, int argc, char* pArgv[], int fd)
+InitAppInfo(const char* packageId, const char* svcId, int argc, char* pArgv[], int fd)
 {
-       result r = Tizen::App::_AppInfo::GetAppInfo()->Construct(appId, svcId, argc, pArgv);
+       result r = Tizen::App::_AppInfo::GetAppInfo()->Construct(packageId, svcId, argc, pArgv);
        if (IsFailed(r))
        {
-               SysLogException(NID_APP, E_SYSTEM, "Application initialization failure for %s.", appId);
-               fprintf(stderr, "Application initialization failure for %s.\n", appId);
+               SysLogException(NID_APP, E_SYSTEM, "Application initialization failure for %s.", packageId);
+               fprintf(stderr, "Application initialization failure for %s.\n", packageId);
 
                _Process::Exit(-1);
        }
@@ -93,7 +93,7 @@ _AppInfo::_AppInfo(void)
        , __appRootDirFd(-1)
        , __appHandlerType(_APP_HANDLER_NONE)
        , __parentWindowHandle(-1)
-       , __apiVersion(_API_VERSION_2_1)
+       , __apiVersion(_API_VERSION_2_2)
        , __pAppName(null)
        , __pAppVersion(null)
        , __argc(0)
@@ -126,14 +126,14 @@ _AppInfo::GetAppInfo(void)
 
 
 result
-_AppInfo::Construct(const char* appId, const char* exeName, int argc, char* argv[])
+_AppInfo::Construct(const char* packageId, const char* exeName, int argc, char* argv[])
 {
-       SysAssertf(appId != null, "Valid appId required to launch application.");
+       SysAssertf(packageId != null, "Valid appId required to launch application.");
 
      FBase_Initialize();
 
        __appExecutableName = exeName;
-       __packageId = appId;
+       __packageId = packageId;
 
        if (__appExecutableName == L"_AppControl")
        {
@@ -160,13 +160,13 @@ _AppInfo::Construct(const char* appId, const char* exeName, int argc, char* argv
                // due to possible dependency problem, FIoFile is not used
                // app root path first
 
-               strncpy(appInfoPath + strlen(PATH_ROOT2), appId, MAX_APPID);
+               strncpy(appInfoPath + strlen(PATH_ROOT2), packageId, MAX_APPID);
 #else
                // [FIXME] temporary code for directory location migration
                int len = strlen(PACKAGE_PATH_FORMAT2);
                strncpy(appInfoPath, PACKAGE_PATH_FORMAT2, len);
                appInfoPath[len] = '\0';
-               strncpy(appInfoPath + strlen(PATH_ROOT2), appId, MAX_APPID);
+               strncpy(appInfoPath + strlen(PATH_ROOT2), packageId, MAX_APPID);
 
                if (euidaccess(appInfoPath, R_OK) != 0)
                {
@@ -174,7 +174,7 @@ _AppInfo::Construct(const char* appId, const char* exeName, int argc, char* argv
                        strncpy(appInfoPath, PACKAGE_PATH_FORMAT, len);
                        appInfoPath[len] = '\0';
                        
-                       strncpy(appInfoPath + strlen(PATH_ROOT), appId, MAX_APPID);
+                       strncpy(appInfoPath + strlen(PATH_ROOT), packageId, MAX_APPID);
                }
 #endif
                // app root directory file descriptor