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>

diff --git a/include/libcgroup.h b/include/libcgroup.h
index 953703b8f62391b0b2cce528c20350c467934002..8a86cb7eed824e39c7561815ca7025cf89a3db86 100644 (file)
--- 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() */

diff --git a/src/api.c b/src/api.c
index 25011bbba6350456f8e0fe09d18046a3f9fa8b51..1012e564fd9ebeadcb629e59439ee73f45fe2621 100644 (file)
--- a/src/api.c
+++ b/src/api.c
@@ -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 2ca663163111df1e78e601f91bab5715e27b0ac4..00016e3960ead6a9e65068be048c4a25e9ce0453 100644 (file)
--- 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;
        }