summaryrefslogtreecommitdiff
path: root/source3/locking
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>1998-09-05 05:07:05 +0000
committerAndrew Tridgell <tridge@samba.org>1998-09-05 05:07:05 +0000
commite9ea36e4d2270bd7d32da12ef6d6e2299641582d (patch)
tree34905bbfb6adde96be7234d122562e678aa6efd8 /source3/locking
parent766aa4ff5c6007669010d8c284de20111e633b25 (diff)
downloadsamba-e9ea36e4d2270bd7d32da12ef6d6e2299641582d.tar.gz
samba-e9ea36e4d2270bd7d32da12ef6d6e2299641582d.tar.bz2
samba-e9ea36e4d2270bd7d32da12ef6d6e2299641582d.zip
tridge the destroyer returns!
prompted by the interpret_security() dead code that Jean-Francois pointed out I added a make target "finddead" that finds potentially dead (ie. unused) code. It spat out 304 function names ... I went through these are deleted many of them, making others static (finddead also reports functions that are used only in the local file). in doing this I have almost certainly deleted some useful code. I may have even prevented compilation with some compile options. I apologise. I decided it was better to get rid of this code now and add back the one or two functions that are needed than to keep all this baggage. So, if I have done a bit too much "destroying" then let me know. Keep the swearing to a minimum :) One bit I didn't do is the ubibt code. Chris, can you look at that? Heaps of unused functions there. Can they be made static? (This used to be commit 2204475c87f3024ea8fd1fbd7385b2def617a46f)
Diffstat (limited to 'source3/locking')
-rw-r--r--source3/locking/shmem.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/source3/locking/shmem.c b/source3/locking/shmem.c
index 3cdcf82f73..d8ef1d2c53 100644
--- a/source3/locking/shmem.c
+++ b/source3/locking/shmem.c
@@ -344,7 +344,7 @@ static BOOL smb_shm_register_process(char *processreg_file, pid_t pid, BOOL *oth
(int)other_pid, (double)seek_back));
#else
DEBUG(5,("smb_shm_register_process : erasing stale record for pid %d (seek_back = %d)\n",
- (int)other_pid, seek_back));
+ (int)other_pid, (int)seek_back));
#endif
other_pid = (pid_t)0;
erased_slot = sys_lseek(smb_shm_processes_fd, seek_back, SEEK_CUR);
@@ -372,7 +372,7 @@ static BOOL smb_shm_register_process(char *processreg_file, pid_t pid, BOOL *oth
(int)pid, (double)free_slot));
#else /* LARGE_SMB_OFF_T */
DEBUG(5,("smb_shm_register_process : writing record for pid %d at offset %d\n",
- (int)pid,free_slot));
+ (int)pid,(int)free_slot));
#endif /* LARGE_SMB_OFF_T */
sys_lseek(smb_shm_processes_fd, free_slot, SEEK_SET);
@@ -416,7 +416,7 @@ static BOOL smb_shm_unregister_process(char *processreg_file, pid_t pid)
(int)other_pid, (double)seek_back));
#else /* LARGE_SMB_OFF_T */
DEBUG(5,("smb_shm_unregister_process : erasing record for pid %d (seek_val = %d)\n",
- (int)other_pid, seek_back));
+ (int)other_pid, (int)seek_back));
#endif /* LARGE_SMB_OFF_T */
other_pid = (pid_t)0;
erased_slot = sys_lseek(smb_shm_processes_fd, seek_back, SEEK_CUR);
@@ -785,7 +785,8 @@ struct shmem_ops *smb_shm_open(int ronly)
#ifdef LARGE_SMB_OFF_T
DEBUG(5,("smb_shm_open : using shmem file %s to be of size %.0f\n",file_name,(double)size));
#else /* LARGE_SMB_OFF_T */
- DEBUG(5,("smb_shm_open : using shmem file %s to be of size %d\n",file_name,size));
+ DEBUG(5,("smb_shm_open : using shmem file %s to be of size %d\n",
+ file_name,(int)size));
#endif /* LARGE_SMB_OFF_T */
smb_shm_fd = open(file_name, read_only?O_RDONLY:(O_RDWR|O_CREAT),
@@ -863,7 +864,7 @@ struct shmem_ops *smb_shm_open(int ronly)
(double)filesize, (double)size));
#else /* LARGE_SMB_OFF_T */
DEBUG(0,("WARNING smb_shm_open : filesize (%d) != expected size (%d), using filesize\n",
- filesize,size));
+ (int)filesize,(int)size));
#endif /* LARGE_SMB_OFF_T */
size = filesize;