From daeeb9509f7d19b8a29fa8e305b876995bc5738a Mon Sep 17 00:00:00 2001 From: Minje Ahn Date: Thu, 27 Aug 2015 11:06:56 +0900 Subject: [PATCH] Change value name Change-Id: Ic43c53418c5379825f481835ce59ec55ccf09a13 Signed-off-by: Minje Ahn --- lib/include/media-util-db.h | 2 +- lib/media-util-cynara.c | 12 ++++++------ lib/media-util-db.c | 10 +++++----- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/lib/include/media-util-db.h b/lib/include/media-util-db.h index eeb720f..f0f807a 100755 --- a/lib/include/media-util-db.h +++ b/lib/include/media-util-db.h @@ -30,7 +30,7 @@ extern "C" { typedef void MediaDBHandle; /**< Handle */ -int media_db_connect(MediaDBHandle **handle, uid_t uid, bool needWrite); +int media_db_connect(MediaDBHandle **handle, uid_t uid, bool need_write); int media_db_disconnect(MediaDBHandle *handle); diff --git a/lib/media-util-cynara.c b/lib/media-util-cynara.c index 5b5e1dc..5c75c0b 100644 --- a/lib/media-util-cynara.c +++ b/lib/media-util-cynara.c @@ -259,7 +259,7 @@ int ms_cynara_check(const ms_peer_credentials *creds, const char *privilege) result = cynara_check(_cynara, creds->smack, session, creds->uid, privilege); G_UNLOCK(cynara_mutex); - if (result < 0) + if (result != CYNARA_API_ACCESS_ALLOWED) ms_cynara_dbg_err("cynara_check", result); MS_SAFE_FREE(session); @@ -269,16 +269,16 @@ int ms_cynara_check(const ms_peer_credentials *creds, const char *privilege) int ms_cynara_enable_credentials_passing(int fd) { const int optval = 1; - int r; + int err; - r = setsockopt(fd, SOL_SOCKET, SO_PASSSEC, &optval, sizeof(optval)); - if (r != 0) { + err = setsockopt(fd, SOL_SOCKET, SO_PASSSEC, &optval, sizeof(optval)); + if (err != 0) { MSAPI_DBG_ERR("Failed to set SO_PASSSEC socket option"); return MS_MEDIA_ERR_SOCKET_INTERNAL; } - r = setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &optval, sizeof(optval)); - if (r != 0) { + err = setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &optval, sizeof(optval)); + if (err != 0) { MSAPI_DBG_ERR("Failed to set SO_PASSCRED socket option"); return MS_MEDIA_ERR_SOCKET_INTERNAL; } diff --git a/lib/media-util-db.c b/lib/media-util-db.c index 075bb69..d8cdbad 100755 --- a/lib/media-util-db.c +++ b/lib/media-util-db.c @@ -40,7 +40,7 @@ static __thread char **sql_list = NULL; static __thread int g_list_idx = 0; static int __media_db_busy_handler(void *pData, int count); -static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, bool needWrite); +static int __media_db_connect_db_with_handle(sqlite3 **db_handle, uid_t uid, bool need_write); static int __media_db_disconnect_db_with_handle(sqlite3 *db_handle); static void __media_db_destroy_sql_list() @@ -100,12 +100,12 @@ static char* __media_get_media_DB(uid_t uid) return result_psswd; } -static int __media_db_connect_db_with_handle(sqlite3 **db_handle,uid_t uid, bool needWrite) +static int __media_db_connect_db_with_handle(sqlite3 **db_handle,uid_t uid, bool need_write) { int ret = SQLITE_OK; /*Connect DB*/ - if (needWrite) { + if (need_write) { ret = db_util_open_with_options(__media_get_media_DB(uid), db_handle, SQLITE_OPEN_READWRITE | SQLITE_OPEN_CREATE, NULL); } else { ret = db_util_open_with_options(__media_get_media_DB(uid), db_handle, SQLITE_OPEN_READONLY, NULL); @@ -402,14 +402,14 @@ static int _media_db_update_directly(sqlite3 *db_handle, const char *sql_str) return ret; } -int media_db_connect(MediaDBHandle **handle, uid_t uid, bool needWrite) +int media_db_connect(MediaDBHandle **handle, uid_t uid, bool need_write) { int ret = MS_MEDIA_ERR_NONE; sqlite3 * db_handle = NULL; MSAPI_DBG_FUNC(); - ret = __media_db_connect_db_with_handle(&db_handle,uid, needWrite); + ret = __media_db_connect_db_with_handle(&db_handle,uid, need_write); MSAPI_RETV_IF(ret != MS_MEDIA_ERR_NONE, ret); *handle = db_handle; -- 2.7.4