projects
/
platform
/
core
/
system
/
swap-manager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
570f25b
)
[REFACTOR] make function naming more consistent
author
Dmitry Bogatov
<d.bogatov@samsung.com>
Mon, 19 Aug 2013 05:16:17 +0000
(09:16 +0400)
committer
Nikita Kalyazin
<n.kalyazin@samsung.com>
Mon, 19 Aug 2013 10:25:41 +0000
(14:25 +0400)
daemon/main.c
patch
|
blob
|
history
diff --git
a/daemon/main.c
b/daemon/main.c
index
7c0aaeb
..
94d45fa
100644
(file)
--- a/
daemon/main.c
+++ b/
daemon/main.c
@@
-101,7
+101,7
@@
__da_manager manager =
// util functions
// =============================================================================
// util functions
// =============================================================================
-static void write
ToP
ortfile(int code)
+static void write
_to_p
ortfile(int code)
{
if(unlikely(manager.portfile == 0))
return;
{
if(unlikely(manager.portfile == 0))
return;
@@
-245,7
+245,7
@@
static bool ensure_singleton(const char *lockfile)
int lockfd = open(lockfile, O_WRONLY | O_CREAT, 0600);
if (lockfd < 0) {
int lockfd = open(lockfile, O_WRONLY | O_CREAT, 0600);
if (lockfd < 0) {
- write
ToP
ortfile(ERR_LOCKFILE_CREATE_FAILED);
+ write
_to_p
ortfile(ERR_LOCKFILE_CREATE_FAILED);
LOGE("singleton lock file creation failed");
return false;
}
LOGE("singleton lock file creation failed");
return false;
}
@@
-253,7
+253,7
@@
static bool ensure_singleton(const char *lockfile)
bool locked = flock(lockfd, LOCK_EX | LOCK_NB) == 0;
if (!locked) {
bool locked = flock(lockfd, LOCK_EX | LOCK_NB) == 0;
if (!locked) {
- write
ToP
ortfile(ERR_ALREADY_RUNNING);
+ write
_to_p
ortfile(ERR_ALREADY_RUNNING);
LOGE("another instance of daemon is already running");
}
close(lockfd);
LOGE("another instance of daemon is already running");
}
close(lockfd);
@@
-287,7
+287,7
@@
static bool initialize_pthread_sigmask()
sigaddset(&newsigmask, SIGALRM);
sigaddset(&newsigmask, SIGUSR1);
if (pthread_sigmask(SIG_BLOCK, &newsigmask, NULL) != 0) {
sigaddset(&newsigmask, SIGALRM);
sigaddset(&newsigmask, SIGUSR1);
if (pthread_sigmask(SIG_BLOCK, &newsigmask, NULL) != 0) {
- write
ToP
ortfile(ERR_SIGNAL_MASK_SETTING_FAILED);
+ write
_to_p
ortfile(ERR_SIGNAL_MASK_SETTING_FAILED);
return false;
}
return true;
return false;
}
return true;
@@
-298,10
+298,10
@@
static bool initialize_host_server_socket()
int port = makeHostServerSocket();
if (port < 0) {
int port = makeHostServerSocket();
if (port < 0) {
- write
ToP
ortfile(ERR_HOST_SERVER_SOCKET_CREATE_FAILED);
+ write
_to_p
ortfile(ERR_HOST_SERVER_SOCKET_CREATE_FAILED);
return false;
}
return false;
}
- write
ToP
ortfile(port);
+ write
_to_p
ortfile(port);
return true;
}
return true;
}
@@
-316,14
+316,14
@@
static int initializeManager()
atexit(_close_server_socket);
if(initialize_system_info() < 0)
{
atexit(_close_server_socket);
if(initialize_system_info() < 0)
{
- write
ToP
ortfile(ERR_INITIALIZE_SYSTEM_INFO_FAILED);
+ write
_to_p
ortfile(ERR_INITIALIZE_SYSTEM_INFO_FAILED);
return -1;
}
// make server socket
if(makeTargetServerSocket() != 0)
{
return -1;
}
// make server socket
if(makeTargetServerSocket() != 0)
{
- write
ToP
ortfile(ERR_TARGET_SERVER_SOCKET_CREATE_FAILED);
+ write
_to_p
ortfile(ERR_TARGET_SERVER_SOCKET_CREATE_FAILED);
return -1;
}
return -1;
}