aboutsummaryrefslogtreecommitdiffstats
path: root/src/bus.c
diff options
context:
space:
mode:
authorMattias Andrée <maandree@operamail.com>2015-08-27 14:03:11 +0200
committerMattias Andrée <maandree@operamail.com>2015-08-27 14:03:11 +0200
commit2373237a74a8af3faff7f325a91494e738d5e0fd (patch)
treed9fa9471584369af647a03e86b2cfa1058e8ebb6 /src/bus.c
parentupdate dist (diff)
downloadbus-2373237a74a8af3faff7f325a91494e738d5e0fd.tar.gz
bus-2373237a74a8af3faff7f325a91494e738d5e0fd.tar.bz2
bus-2373237a74a8af3faff7f325a91494e738d5e0fd.tar.xz
fix warnings
Signed-off-by: Mattias Andrée <maandree@operamail.com>
Diffstat (limited to 'src/bus.c')
-rw-r--r--src/bus.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/bus.c b/src/bus.c
index 3205e25..4b6b8d1 100644
--- a/src/bus.c
+++ b/src/bus.c
@@ -1170,11 +1170,11 @@ bus_chmod(const char *file, mode_t mode)
struct shmid_ds shm_stat;
int shm_id;
- mode = (mode & S_IRWXU) ? (mode | S_IRWXU) : (mode & ~S_IRWXU);
- mode = (mode & S_IRWXG) ? (mode | S_IRWXG) : (mode & ~S_IRWXG);
- mode = (mode & S_IRWXO) ? (mode | S_IRWXO) : (mode & ~S_IRWXO);
+ mode = (mode & S_IRWXU) ? (mode | S_IRWXU) : (mode & (mode_t)~S_IRWXU);
+ mode = (mode & S_IRWXG) ? (mode | S_IRWXG) : (mode & (mode_t)~S_IRWXG);
+ mode = (mode & S_IRWXO) ? (mode | S_IRWXO) : (mode & (mode_t)~S_IRWXO);
mode &= (S_IWUSR | S_IWGRP | S_IWOTH | S_IRUSR | S_IRGRP | S_IROTH);
- fmode = mode & ~(S_IWGRP | S_IWOTH);
+ fmode = mode & (mode_t)~(S_IWGRP | S_IWOTH);
t(bus_open(&bus, file, -1));
t(chmod(file, fmode));
@@ -1182,13 +1182,13 @@ bus_chmod(const char *file, mode_t mode)
/* chmod sem */
t(open_semaphores(&bus));
t(semctl(bus.sem_id, 0, IPC_STAT, &sem_stat));
- sem_stat.sem_perm.mode = mode;
+ sem_stat.sem_perm.mode = (unsigned short)mode;
t(semctl(bus.sem_id, 0, IPC_SET, &sem_stat));
/* chmod shm */
t(shm_id = shmget(bus.key_shm, (size_t)BUS_MEMORY_SIZE, 0));
t(shmctl(shm_id, IPC_STAT, &shm_stat));
- shm_stat.shm_perm.mode = mode;
+ shm_stat.shm_perm.mode = (unsigned short)mode;
t(shmctl(shm_id, IPC_SET, &shm_stat));
return 0;