[Ltp-cvs] ltp/testcases/network/nfs/nfslock01 nfs_flock.c,1.1,1.2 nfs_flock_dgen.c,1.1,1.2 nfs_flock_frk.c,1.1,1.2 nfs_flock_func.c,1.1,1.2

[Robert W. <ro...@us...>]

Update of /cvsroot/ltp/ltp/testcases/network/nfs/nfslock01
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4653/nfslock01

Modified Files:
	nfs_flock.c nfs_flock_dgen.c nfs_flock_frk.c nfs_flock_func.c 
Log Message:
Applied patch from David Marlin:
The attached patch adds missing include files, function prototypes and 
returns, and removes unused variables to eliminate warning messages.
It also corrects some sprintf format warnings and replaces 'abortx' with 
a version that accepts a variable number of arguments.


d.marlin


Index: nfs_flock_frk.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/network/nfs/nfslock01/nfs_flock_frk.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nfs_flock_frk.c	27 Aug 2001 22:15:16 -0000	1.1
--- nfs_flock_frk.c	3 Oct 2005 18:03:23 -0000	1.2
***************
*** 4,16 ****
  
  #include <stdio.h>
  #include <errno.h>
  #include <sys/types.h>
  #include <sys/wait.h>
  
  main(argc, argv)
     int argc;
     char **argv;
  {
-    int i, fd, val;
     pid_t pid;
     char *Prog;
--- 4,19 ----
  
  #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
  #include <errno.h>
  #include <sys/types.h>
  #include <sys/wait.h>
  
+ int
  main(argc, argv)
     int argc;
     char **argv;
  {
     pid_t pid;
     char *Prog;

Index: nfs_flock.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/network/nfs/nfslock01/nfs_flock.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nfs_flock.c	27 Aug 2001 22:15:16 -0000	1.1
--- nfs_flock.c	3 Oct 2005 18:03:23 -0000	1.2
***************
*** 7,14 ****
--- 7,20 ----
  #include "nfs_flock.h"
  #include <errno.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
  
  #define BYTES 64
  #define LINES 16384
  
+ int lock_reg(int, int, int, int, int, int);
+ 
+ int 
  main(argc, argv)
     int argc;

Index: nfs_flock_func.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/network/nfs/nfslock01/nfs_flock_func.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nfs_flock_func.c	27 Aug 2001 22:15:16 -0000	1.1
--- nfs_flock_func.c	3 Oct 2005 18:03:23 -0000	1.2
***************
*** 1,3 ****
--- 1,8 ----
+ #include <stdlib.h>
+ #include <unistd.h>
+                                                                                                                         
  #include "nfs_flock.h"
+ 
+ int
  lock_reg(fd, type, offset, whence, len, cmd)
     int fd, type, offset;

Index: nfs_flock_dgen.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/network/nfs/nfslock01/nfs_flock_dgen.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** nfs_flock_dgen.c	27 Aug 2001 22:15:16 -0000	1.1
--- nfs_flock_dgen.c	3 Oct 2005 18:03:23 -0000	1.2
***************
*** 4,9 ****
  
  #include <stdio.h>
  
! main(argc, argv)
  int argc;
  char **argv;
--- 4,11 ----
  
  #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
  
! int main(argc, argv)
  int argc;
  char **argv;
***************
*** 53,57 ****
  
     fclose(fp);
!    exit(0);
  }
  
--- 55,59 ----
  
     fclose(fp);
!    return(0);
  }