diff options
| author | Jan Safranek <jsafrane@redhat.com> | 2009-06-30 14:29:12 +0200 |
|---|---|---|
| committer | Dhaval Giani <dhaval@linux.vnet.ibm.com> | 2009-07-01 20:34:49 +0530 |
| commit | 94a0ad95bc19f181beadef7cf7c4dade556eba7f (patch) | |
| tree | e694e396a985ffd442597b220d849f79eb0f2a73 | |
| parent | 8a96474be4f14482d171645ee9710b3ac318c14a (diff) | |
| download | libcg-94a0ad95bc19f181beadef7cf7c4dade556eba7f.tar.gz libcg-94a0ad95bc19f181beadef7cf7c4dade556eba7f.tar.xz libcg-94a0ad95bc19f181beadef7cf7c4dade556eba7f.zip | |
Cleanup: find better name for CGRULE_CGRED_TEMP_FILE
Rename CGRULE_CGRED_TEMP_FILE to CGRULE_CGRED_SOCKET_PATH to better describe
the macro usage - it's not a temporary file, it's a socket.
Signed-off-by: Jan Safranek <jsafrane@redhat.com>
Signed-off-by: Dhaval Giani <dhaval@linux.vnet.ibm.com>
| -rw-r--r-- | include/libcgroup.h | 2 | ||||
| -rw-r--r-- | src/api.c | 4 | ||||
| -rw-r--r-- | src/daemon/cgrulesengd.c | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/include/libcgroup.h b/include/libcgroup.h index 953703b..8a86cb7 100644 --- a/include/libcgroup.h +++ b/include/libcgroup.h @@ -53,7 +53,7 @@ __BEGIN_DECLS #define CGRULE_WILD (-2) /* FIXME: Change the temporary file to configurable one. */ -#define CGRULE_CGRED_TEMP_FILE "/tmp/cgred" +#define CGRULE_CGRED_SOCKET_PATH "/tmp/cgred" #define CGRULE_SUCCESS_STORE_PID "SUCCESS_STORE_PID" /* Flags for cgroup_change_cgroup_uid_gid() */ @@ -2948,10 +2948,10 @@ int cgroup_register_unchanged_process(pid_t pid, int flags) bzero((char *)&addr, sizeof(addr)); addr.sun_family = AF_UNIX; - strcpy(addr.sun_path, CGRULE_CGRED_TEMP_FILE); + strcpy(addr.sun_path, CGRULE_CGRED_SOCKET_PATH); if (connect(sk, (struct sockaddr *)&addr, - sizeof(addr.sun_family) + strlen(CGRULE_CGRED_TEMP_FILE)) < 0) { + sizeof(addr.sun_family) + strlen(CGRULE_CGRED_SOCKET_PATH)) < 0) { /* If the daemon does not work, this function returns 0 * as success. */ ret = 0; diff --git a/src/daemon/cgrulesengd.c b/src/daemon/cgrulesengd.c index 2ca6631..00016e3 100644 --- a/src/daemon/cgrulesengd.c +++ b/src/daemon/cgrulesengd.c @@ -662,10 +662,10 @@ int cgre_create_netlink_socket_process_msg() } memset(&saddr, 0, sizeof(saddr)); saddr.sun_family = AF_UNIX; - strcpy(saddr.sun_path, CGRULE_CGRED_TEMP_FILE); - unlink(CGRULE_CGRED_TEMP_FILE); + strcpy(saddr.sun_path, CGRULE_CGRED_SOCKET_PATH); + unlink(CGRULE_CGRED_SOCKET_PATH); if (bind(sk_unix, (struct sockaddr *)&saddr, - sizeof(saddr.sun_family) + strlen(CGRULE_CGRED_TEMP_FILE)) < 0) { + sizeof(saddr.sun_family) + strlen(CGRULE_CGRED_SOCKET_PATH)) < 0) { cgroup_dbg("binding sk_unix error"); goto close_and_exit; } |