Browse Source

* samba/lib/signal.c: Remove.

* samba/lib/debug.c (sig_usr2): Commented out.
(sig_usr1): Likewise.
* samba/lib/util_file.c (gotalarm): Commented out.
(gotalarm_sig): Likewise.
(do_file_lock): Likewise.
(file_lock): Likewise.
(file_unlock): Likewise.
(startfilepwent): Likewise.
(endfilepwent): Likewise.

* samba/Makefile.in (SAMBAFILES): Remove lib/signal.o.
* Makefile.am (SAMBA_DIST): Remove lib/signal.c.
Andrew V. Samoilov 23 years ago
parent
commit
f7c7879add
5 changed files with 21 additions and 5 deletions
  1. 17 0
      vfs/ChangeLog
  2. 0 1
      vfs/Makefile.am
  3. 0 1
      vfs/samba/Makefile.in
  4. 2 2
      vfs/samba/lib/debug.c
  5. 2 1
      vfs/samba/lib/util_file.c

+ 17 - 0
vfs/ChangeLog

@@ -1,3 +1,20 @@
+2002-04-24  Andrew V. Samoilov  <kai@cmail.ru>
+
+	* samba/lib/signal.c: Remove.
+
+	* samba/lib/debug.c (sig_usr2): Commented out.
+	(sig_usr1): Likewise.
+	* samba/lib/util_file.c (gotalarm): Commented out.
+	(gotalarm_sig): Likewise.
+	(do_file_lock): Likewise.
+	(file_lock): Likewise.
+	(file_unlock): Likewise.
+	(startfilepwent): Likewise.
+	(endfilepwent): Likewise.
+
+	* samba/Makefile.in (SAMBAFILES): Remove lib/signal.o.
+	* Makefile.am (SAMBA_DIST): Remove lib/signal.c.
+
 2002-04-19  Andrew V. Samoilov  <kai@cmail.ru>
 
 	* vfs.c (vfs_init) [!WITH_MCFS]: Don't register mcfs.

+ 0 - 1
vfs/Makefile.am

@@ -154,7 +154,6 @@ SAMBA_DIST =			\
 	lib/kanji.c		\
 	lib/md4.c		\
 	lib/netmask.c		\
-	lib/signal.c		\
 	lib/slprintf.c		\
 	lib/system.c		\
 	lib/time.c		\

+ 0 - 1
vfs/samba/Makefile.in

@@ -92,7 +92,6 @@ SAMBAFILES=			\
 	lib/charset.o 	\
 	lib/username.o 	\
 	lib/util_file.o 	\
-	lib/signal.o 	\
 	lib/util_sock.o 	\
 	lib/genrand.o 	\
 	lib/md4.o 	\

+ 2 - 2
vfs/samba/lib/debug.c

@@ -115,7 +115,7 @@ static size_t     format_pos     = 0;
 /* -------------------------------------------------------------------------- **
  * Functions...
  */
-
+#if 0
 #if defined(SIGUSR2)
 /* ************************************************************************** **
  * catch a sigusr2 - decrease the debug log level.
@@ -157,7 +157,7 @@ void sig_usr1( int sig )
 
   } /* sig_usr1 */
 #endif /* SIGUSR1 */
-
+#endif
 
 /* ************************************************************************** **
  * get ready for syslog stuff

+ 2 - 1
vfs/samba/lib/util_file.c

@@ -21,6 +21,7 @@
 
 extern int DEBUGLEVEL;
 
+#if 0
 static int gotalarm;
 
 /***************************************************************
@@ -65,7 +66,6 @@ BOOL do_file_lock(int fd, int waitsecs, int type)
   return (ret == 0);
 }
 
-
 /***************************************************************
  Lock an fd. Abandon after waitsecs seconds.
 ****************************************************************/
@@ -160,6 +160,7 @@ void endfilepwent(void *vp, int *file_lock_depth)
   fclose(fp);
   DEBUG(7, ("endfilepwent: closed file.\n"));
 }
+#endif
 
 /*************************************************************************
  Return the current position in the file list as an SMB_BIG_UINT.