X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=ipc.c;fp=ipc.c;h=bc8995aeef86590d5755635466bb86ab419b1133;hb=f6ae5e4753277ea35509c36dc618097b1175d632;hp=723570e60b291811b8de24214159d18423557ee3;hpb=c92370affe722f38a85a41d1b5524e4a102b8f4d;p=dss.git

diff --git a/ipc.c b/ipc.c
index 723570e..bc8995a 100644
--- a/ipc.c
+++ b/ipc.c
@@ -22,9 +22,9 @@
 #include "err.h"
 #include "ipc.h"
 
-static int get_key(const char *config_file)
+static key_t get_key(const char *config_file)
 {
-	int ret;
+	key_t ret;
 
 	assert(config_file);
 	ret = ftok(config_file, 'D');
@@ -40,11 +40,11 @@ static int get_key(const char *config_file)
 	return 0x0D55; /* no magic, this number just looks a bit like DSS */
 }
 
-static int mutex_get(int key, int flags)
+static int mutex_get(key_t key, int flags)
 {
 	int ret;
 
-	DSS_DEBUG_LOG(("getting semaphore 0x%x\n", key));
+	DSS_DEBUG_LOG(("getting semaphore 0x%lx\n", (long)key));
 	ret = semget(key, 2, flags);
 	if (ret < 0)
 		return -ERRNO_TO_DSS_ERROR(errno);
@@ -108,7 +108,8 @@ static bool mutex_is_locked(int id)
 
 int lock_dss(char *config_file)
 {
-	int ret, key = get_key(config_file);
+	int ret;
+	key_t key = get_key(config_file);
 
 	ret = mutex_get(key, IPC_CREAT | 0600);
 	if (ret < 0)
@@ -118,7 +119,8 @@ int lock_dss(char *config_file)
 
 int get_dss_pid(char *config_file, pid_t *pid)
 {
-	int ret, semid, key = get_key(config_file);
+	int ret, semid;
+	key_t key = get_key(config_file);
 
 	if (pid)
 		*pid = 0;