r17592: Remove some unused functions pointed out by John E. Malmberg, make

do_file_lock static to pdb_smbpasswd.c, the only user of it.

Volker
(This used to be commit 543f77a45f0a75ede48b0f2c674a0abdd386fed5)

2 files changed, 46 insertions, 235 deletions

diff --git a/source3/lib/util_file.c b/source3/lib/util_file.c
index 77ee95cc38..1e0d880e83 100644
--- a/source3/lib/util_file.c
+++ b/source3/lib/util_file.c
@@ -24,241 +24,6 @@
 #define MAP_FAILED ((void *)-1)
 #endif
 
-static int gotalarm;
-
-/***************************************************************
- Signal function to tell us we timed out.
-****************************************************************/
-
-static void gotalarm_sig(void)
-{
-	gotalarm = 1;
-}
-
-/***************************************************************
- Lock or unlock a fd for a known lock type. Abandon after waitsecs 
- seconds.
-****************************************************************/
-
-BOOL do_file_lock(int fd, int waitsecs, int type)
-{
-	SMB_STRUCT_FLOCK lock;
-	int             ret;
-	void (*oldsig_handler)(int);
-
-	gotalarm = 0;
-	oldsig_handler = CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
-
-	lock.l_type = type;
-	lock.l_whence = SEEK_SET;
-	lock.l_start = 0;
-	lock.l_len = 1;
-	lock.l_pid = 0;
-
-	alarm(waitsecs);
-	/* Note we must *NOT* use sys_fcntl here ! JRA */
-	ret = fcntl(fd, SMB_F_SETLKW, &lock);
-	alarm(0);
-	CatchSignal(SIGALRM, SIGNAL_CAST oldsig_handler);
-
-	if (gotalarm) {
-		DEBUG(0, ("do_file_lock: failed to %s file.\n",
-			type == F_UNLCK ? "unlock" : "lock"));
-		return False;
-	}
-
-	return (ret == 0);
-}
-
-/***************************************************************
- Lock an fd. Abandon after waitsecs seconds.
-****************************************************************/
-
-BOOL file_lock(int fd, int type, int secs, int *plock_depth)
-{
-	if (fd < 0)
-		return False;
-
-	(*plock_depth)++;
-
-	if ((*plock_depth) == 0) {
-		if (!do_file_lock(fd, secs, type)) {
-			DEBUG(10,("file_lock: locking file failed, error = %s.\n", strerror(errno)));
-			return False;
-		}
-	}
-
-	return True;
-}
-
-/***************************************************************
- Unlock an fd. Abandon after waitsecs seconds.
-****************************************************************/
-
-BOOL file_unlock(int fd, int *plock_depth)
-{
-	BOOL ret=True;
-
-	if(*plock_depth == 1) {
-		ret = do_file_lock(fd, 5, F_UNLCK);
-	}
-
-	(*plock_depth)--;
-
-	if(!ret) {
-		DEBUG(10,("file_unlock: unlocking file failed, error = %s.\n", strerror(errno)));
-	}
-	return ret;
-}
-
-/***************************************************************
- Locks a file for enumeration / modification.
- update to be set = True if modification is required.
-****************************************************************/
-
-void *startfilepwent(char *pfile, char *s_readbuf, int bufsize,
-				int *file_lock_depth, BOOL update)
-{
-	FILE *fp = NULL;
-
-	if (!*pfile) {
-		DEBUG(0, ("startfilepwent: No file set\n"));
-		return (NULL);
-	}
-	DEBUG(10, ("startfilepwent: opening file %s\n", pfile));
-
-	fp = sys_fopen(pfile, update ? "r+b" : "rb");
-
-	if (fp == NULL) {
-		DEBUG(0, ("startfilepwent: unable to open file %s\n", pfile));
-		return NULL;
-	}
-
-	/* Set a buffer to do more efficient reads */
-	setvbuf(fp, s_readbuf, _IOFBF, bufsize);
-
-	if (!file_lock(fileno(fp), (update ? F_WRLCK : F_RDLCK), 5, file_lock_depth)) {
-		DEBUG(0, ("startfilepwent: unable to lock file %s\n", pfile));
-		fclose(fp);
-		return NULL;
-	}
-
-	/* Make sure it is only rw by the owner */
-	chmod(pfile, 0600);
-
-	/* We have a lock on the file. */
-	return (void *)fp;
-}
-
-/***************************************************************
- End enumeration of the file.
-****************************************************************/
-
-void endfilepwent(void *vp, int *file_lock_depth)
-{
-	FILE *fp = (FILE *)vp;
-
-	file_unlock(fileno(fp), file_lock_depth);
-	fclose(fp);
-	DEBUG(7, ("endfilepwent: closed file.\n"));
-}
-
-/*************************************************************************
- Return the current position in the file list as an SMB_BIG_UINT.
- This must be treated as an opaque token.
-*************************************************************************/
-
-SMB_BIG_UINT getfilepwpos(void *vp)
-{
-	return (SMB_BIG_UINT)sys_ftell((FILE *)vp);
-}
-
-/*************************************************************************
- Set the current position in the file list from an SMB_BIG_UINT.
- This must be treated as an opaque token.
-*************************************************************************/
-
-BOOL setfilepwpos(void *vp, SMB_BIG_UINT tok)
-{
-	return !sys_fseek((FILE *)vp, (SMB_OFF_T)tok, SEEK_SET);
-}
-
-/*************************************************************************
- Gets a line out of a file.
- line is of format "xxxx:xxxxxx:xxxxx:".
- lines with "#" at the front are ignored.
-*************************************************************************/
-
-int getfileline(void *vp, char *linebuf, int linebuf_size)
-{
-	/* Static buffers we will return. */
-	FILE *fp = (FILE *)vp;
-	unsigned char   c;
-	unsigned char  *p;
-	size_t linebuf_len;
-
-	if (fp == NULL) {
-		DEBUG(0,("getfileline: Bad file pointer.\n"));
-		return -1;
-	}
-
-	/*
-	 * Scan the file, a line at a time.
-	 */
-	while (!feof(fp)) {
-		linebuf[0] = '\0';
-
-		fgets(linebuf, linebuf_size, fp);
-		if (ferror(fp)) {
-			return -1;
-		}
-
-		/*
-		 * Check if the string is terminated with a newline - if not
-		 * then we must keep reading and discard until we get one.
-		 */
-
-		linebuf_len = strlen(linebuf);
-		if (linebuf_len == 0) {
-			linebuf[0] = '\0';
-			return 0;
-		}
-
-		if (linebuf[linebuf_len - 1] != '\n') {
-			c = '\0';
-			while (!ferror(fp) && !feof(fp)) {
-				c = fgetc(fp);
-				if (c == '\n') {
-					break;
-				}
-			}
-		} else {
-			linebuf[linebuf_len - 1] = '\0';
-		}
-
-#ifdef DEBUG_PASSWORD
-		DEBUG(100, ("getfileline: got line |%s|\n", linebuf));
-#endif
-		if ((linebuf[0] == 0) && feof(fp)) {
-			DEBUG(4, ("getfileline: end of file reached\n"));
-			return 0;
-		}
-
-		if (linebuf[0] == '#' || linebuf[0] == '\0') {
-			DEBUG(6, ("getfileline: skipping comment or blank line\n"));
-			continue;
-		}
-
-		p = (unsigned char *) strchr_m(linebuf, ':');
-		if (p == NULL) {
-			DEBUG(0, ("getfileline: malformed line entry (no :)\n"));
-			continue;
-		}
-		return linebuf_len;
-	}
-	return -1;
-}
-
 /****************************************************************************
  Read a line from a file with possible \ continuation chars. 
  Blanks at the start or end of a line are stripped.
diff --git a/source3/passdb/pdb_smbpasswd.c b/source3/passdb/pdb_smbpasswd.c
index c3f190ff30..d4652ca044 100644
--- a/source3/passdb/pdb_smbpasswd.c
+++ b/source3/passdb/pdb_smbpasswd.c
@@ -64,6 +64,52 @@ struct smbpasswd_privates
 
 enum pwf_access_type { PWF_READ, PWF_UPDATE, PWF_CREATE };
 
+static SIG_ATOMIC_T gotalarm;
+
+/***************************************************************
+ Signal function to tell us we timed out.
+****************************************************************/
+
+static void gotalarm_sig(void)
+{
+	gotalarm = 1;
+}
+
+/***************************************************************
+ Lock or unlock a fd for a known lock type. Abandon after waitsecs 
+ seconds.
+****************************************************************/
+
+static BOOL do_file_lock(int fd, int waitsecs, int type)
+{
+	SMB_STRUCT_FLOCK lock;
+	int             ret;
+	void (*oldsig_handler)(int);
+
+	gotalarm = 0;
+	oldsig_handler = CatchSignal(SIGALRM, SIGNAL_CAST gotalarm_sig);
+
+	lock.l_type = type;
+	lock.l_whence = SEEK_SET;
+	lock.l_start = 0;
+	lock.l_len = 1;
+	lock.l_pid = 0;
+
+	alarm(waitsecs);
+	/* Note we must *NOT* use sys_fcntl here ! JRA */
+	ret = fcntl(fd, SMB_F_SETLKW, &lock);
+	alarm(0);
+	CatchSignal(SIGALRM, SIGNAL_CAST oldsig_handler);
+
+	if (gotalarm) {
+		DEBUG(0, ("do_file_lock: failed to %s file.\n",
+			type == F_UNLCK ? "unlock" : "lock"));
+		return False;
+	}
+
+	return (ret == 0);
+}
+
 /***************************************************************
  Lock an fd. Abandon after waitsecs seconds.
 ****************************************************************/