2007-06-21 Martin Hunt <hunt@redhat.com>

	* chmod.c, dir.c, mmap.c, net1.c, readwrite.c, stat.c,
	sync.c, trunc.c: Eliminated hardcoded fd numbers.

9 files changed, 45 insertions, 40 deletions

diff --git a/testsuite/systemtap.syscall/ChangeLog b/testsuite/systemtap.syscall/ChangeLog
index 3765d7bb..c55b7344 100644
--- a/testsuite/systemtap.syscall/ChangeLog
+++ b/testsuite/systemtap.syscall/ChangeLog
@@ -1,3 +1,8 @@
+2007-06-21  Martin Hunt  <hunt@redhat.com>
+
+	* chmod.c, dir.c, mmap.c, net1.c, readwrite.c, stat.c,
+	sync.c, trunc.c: Eliminated hardcoded fd numbers.
+
 2007-06-18  Martin Hunt  <hunt@redhat.com>
 
 	* syscall.exp (test_procedure): Use switch statements to clean
diff --git a/testsuite/systemtap.syscall/chmod.c b/testsuite/systemtap.syscall/chmod.c
index fd7473f4..671c74bc 100644
--- a/testsuite/systemtap.syscall/chmod.c
+++ b/testsuite/systemtap.syscall/chmod.c
@@ -11,13 +11,13 @@ int main()
   int fd;
 
   fd = open("foobar",O_WRONLY|O_CREAT, 0666);
-  // open ("foobar", O_WRONLY|O_CREAT, 0666) = 4
+  // open ("foobar", O_WRONLY|O_CREAT, 0666) = NNNN
 
   chmod("foobar", 0644);
   // chmod ("foobar", 0644) = 0
 
   fchmod(fd, 0444);
-  // fchmod (4, 0444) = 0
+  // fchmod (NNNN, 0444) = 0
 
   chown("foobar", 5000, -1);
 #ifdef __i386__
@@ -35,16 +35,16 @@ int main()
 
   fchown(fd, 5002, -1);
 #ifdef __i386__
-  // fchown (4, 5002, -1) =
+  // fchown (NNNN, 5002, -1) =
 #else
-  // fchown (4, 5002, NNNN) =
+  // fchown (NNNN, 5002, NNNN) =
 #endif
 
   fchown(fd, -1, 5003);
 #ifdef __i386__
-  // fchown (4, -1, 5003) =
+  // fchown (NNNN, -1, 5003) =
 #else
-  // fchown (4, NNNN, 5003) =
+  // fchown (NNNN, NNNN, 5003) =
 #endif
 
   lchown("foobar", 5004, -1);
@@ -67,9 +67,9 @@ int main()
   syscall(SYS_chown, "foobar", -1, 5001);
   // chown16 ("foobar", -1, 5001) =
   syscall(SYS_fchown, fd, 5002, -1);
-  // fchown16 (4, 5002, -1) =
+  // fchown16 (NNNN, 5002, -1) =
   syscall(SYS_fchown, fd, -1, 5003);
-  // fchown16 (4, -1, 5003) =
+  // fchown16 (NNNN, -1, 5003) =
   syscall(SYS_lchown, "foobar", 5004, -1);
   // lchown16 ("foobar", 5004, -1) =
   syscall(SYS_lchown, "foobar", -1, 5005);
diff --git a/testsuite/systemtap.syscall/dir.c b/testsuite/systemtap.syscall/dir.c
index 3609fecd..5de4ce35 100644
--- a/testsuite/systemtap.syscall/dir.c
+++ b/testsuite/systemtap.syscall/dir.c
@@ -20,31 +20,31 @@ int main()
   // chdir ("..") = 0
 
   fd = open("foobar", O_RDONLY);
-  // open ("foobar", O_RDONLY) = 4
+  // open ("foobar", O_RDONLY) = NNNN
 
   fchdir(fd);
-  // fchdir (4) = 0
+  // fchdir (NNNN) = 0
 
   chdir("..");
   // chdir ("..") = 0
 
   close(fd);
-  // close (4) = 0
+  // close (NNNN) = 0
 
   rmdir("foobar");
   // rmdir ("foobar") = 0
 
   fd = open(".", O_RDONLY);
-  // open (".", O_RDONLY) = 4
+  // open (".", O_RDONLY) = NNNN
 
 #ifdef SYS_mkdirat
   mkdirat(fd, "xyzzy", 0765);
-  // mkdirat (4, "xyzzy", 0765) = 0
+  // mkdirat (NNNN, "xyzzy", 0765) = 0
 
 #endif
 
   close(fd);
-  // close (4) = 0
+  // close (NNNN) = 0
 
   rmdir("xyzzy");
   // rmdir ("xyzzy") =
diff --git a/testsuite/systemtap.syscall/mmap.c b/testsuite/systemtap.syscall/mmap.c
index 80a98902..a3a0dc34 100644
--- a/testsuite/systemtap.syscall/mmap.c
+++ b/testsuite/systemtap.syscall/mmap.c
@@ -13,21 +13,21 @@ int main()
 
 	/* create a file with something in it */
 	fd = open("foobar",O_WRONLY|O_CREAT|O_TRUNC, 0600);
-	// open ("foobar", O_WRONLY|O_CREAT|O_TRUNC, 0600) = 4
+	// open ("foobar", O_WRONLY|O_CREAT|O_TRUNC, 0600) = NNNN
 	lseek(fd, 1024, SEEK_SET);
 	write(fd, "abcdef", 6);
 	close(fd);
-	// close (4) = 0
+	// close (NNNN) = 0
 
 	fd = open("foobar", O_RDONLY);
-	// open ("foobar", O_RDONLY) = 4
+	// open ("foobar", O_RDONLY) = NNNN
 
 	/* stat for file size */
 	ret = fstat(fd, &fs);
-	// fstat (4, XXXX) = 0
+	// fstat (NNNN, XXXX) = 0
 
 	r = mmap(NULL, fs.st_size, PROT_READ, MAP_SHARED, fd, 0);
-	// mmap[2]* (XXXX, 1030, PROT_READ, MAP_SHARED, 4, XXXX) = XXXX
+	// mmap[2]* (XXXX, 1030, PROT_READ, MAP_SHARED, NNNN, XXXX) = XXXX
 
 	close(fd);
 
diff --git a/testsuite/systemtap.syscall/net1.c b/testsuite/systemtap.syscall/net1.c
index 7ff9a294..219a3860 100644
--- a/testsuite/systemtap.syscall/net1.c
+++ b/testsuite/systemtap.syscall/net1.c
@@ -29,7 +29,7 @@ int main()
   // bind (NNNN, {AF_INET, 0.0.0.0, 8765}, 16) = 0
 
   listen (listenfd, 7);
-  // listen (4, 7) = 0
+  // listen (NNNN, 7) = 0
 
   cfd = accept(listenfd, (struct sockaddr *)NULL, NULL);
   // accept (NNNN, 0x[0]+, 0x[0]+) = -NNNN (EAGAIN)
diff --git a/testsuite/systemtap.syscall/readwrite.c b/testsuite/systemtap.syscall/readwrite.c
index 88f3a38a..6d53207d 100644
--- a/testsuite/systemtap.syscall/readwrite.c
+++ b/testsuite/systemtap.syscall/readwrite.c
@@ -25,50 +25,50 @@ int main()
   v[2].iov_len = sizeof(STRING3);
 
   fd = open("foobar1",O_WRONLY|O_CREAT, 0666);
-  // open ("foobar1", O_WRONLY|O_CREAT, 0666) = 4
+  // open ("foobar1", O_WRONLY|O_CREAT, 0666) = NNNN
 
   write(fd,"Hello world", 11);
-  // write (4, "Hello world", 11) = 11
+  // write (NNNN, "Hello world", 11) = 11
 
   write(fd,"Hello world abcdefghijklmnopqrstuvwxyz 01234567890", 50);
-  // write (4, "Hello world abc"..., 50) = 50
+  // write (NNNN, "Hello world abc"..., 50) = 50
 
   writev(fd, v, 3);
-  // writev (4, XXXX, 3) = 15
+  // writev (NNNN, XXXX, 3) = 15
 
   lseek(fd, 0, SEEK_SET);
-  // lseek (4, 0, SEEK_SET) = 0
+  // lseek (NNNN, 0, SEEK_SET) = 0
 
   lseek(fd, 1, SEEK_CUR);
-  // lseek (4, 1, SEEK_CUR) = 1
+  // lseek (NNNN, 1, SEEK_CUR) = 1
 
   lseek(fd, -1, SEEK_END);
-  // lseek (4, -1, SEEK_END) = 75
+  // lseek (NNNN, -1, SEEK_END) = 75
 
 #ifdef SYS__llseek
   syscall(SYS__llseek, fd, 1, 0, &res, SEEK_SET);
-  // llseek (4, 0x1, 0x0, XXXX, SEEK_SET) = 0
+  // llseek (NNNN, 0x1, 0x0, XXXX, SEEK_SET) = 0
 
   syscall(SYS__llseek, fd, 0, 0, &res, SEEK_SET);
-  // llseek (4, 0x0, 0x0, XXXX, SEEK_SET) = 0
+  // llseek (NNNN, 0x0, 0x0, XXXX, SEEK_SET) = 0
 
   syscall(SYS__llseek, fd, 0, 12, &res, SEEK_CUR);
-  // llseek (4, 0x0, 0xc, XXXX, SEEK_CUR) = 0
+  // llseek (NNNN, 0x0, 0xc, XXXX, SEEK_CUR) = 0
 
   syscall(SYS__llseek, fd, 8, 1, &res, SEEK_END);
-  // llseek (4, 0x8, 0x1, XXXX, SEEK_END) = 0
+  // llseek (NNNN, 0x8, 0x1, XXXX, SEEK_END) = 0
 #endif
 
   close (fd);
 
   fd = open("foobar1",O_RDONLY);
-  // open ("foobar1", O_RDONLY) = 4
+  // open ("foobar1", O_RDONLY) = NNNN
 
   read(fd, buf, 11);
-  // read (4, XXXX, 11) = 11
+  // read (NNNN, XXXX, 11) = 11
 
   read(fd, buf, 50);
-  // read (4, XXXX, 50) = 50
+  // read (NNNN, XXXX, 50) = 50
 
   x[0].iov_base = buf1;
   x[0].iov_len = sizeof(STRING1);
@@ -77,7 +77,7 @@ int main()
   x[2].iov_base = buf3;
   x[2].iov_len = sizeof(STRING3);
   readv(fd, x, 3);
-  // readv (4, XXXX, 3) = 15
+  // readv (NNNN, XXXX, 3) = 15
 
   close (fd);
 
diff --git a/testsuite/systemtap.syscall/stat.c b/testsuite/systemtap.syscall/stat.c
index 16161093..1b31d816 100644
--- a/testsuite/systemtap.syscall/stat.c
+++ b/testsuite/systemtap.syscall/stat.c
@@ -20,10 +20,10 @@ int main()
   // getcwd (XXXX, 128) = NNNN
 
   fd = creat("foobar",S_IREAD|S_IWRITE);
-  // open ("foobar", O_WRONLY|O_CREAT|O_TRUNC, 0600) = 4
+  // open ("foobar", O_WRONLY|O_CREAT|O_TRUNC, 0600) = NNNN
 
   fstat(fd, &sbuf);
-  // fstat (4, XXXX) = 0
+  // fstat (NNNN, XXXX) = 0
 
   close(fd);
 
diff --git a/testsuite/systemtap.syscall/sync.c b/testsuite/systemtap.syscall/sync.c
index b23d68be..637bc197 100644
--- a/testsuite/systemtap.syscall/sync.c
+++ b/testsuite/systemtap.syscall/sync.c
@@ -16,10 +16,10 @@ int main()
   // sync () = 0
 
   fsync(fd);
-  // fsync (4) = 0
+  // fsync (NNNN) = 0
 
   fdatasync(fd);
-  // fdatasync (4) = 0
+  // fdatasync (NNNN) = 0
 
   close(fd);
 
diff --git a/testsuite/systemtap.syscall/trunc.c b/testsuite/systemtap.syscall/trunc.c
index ff20cb39..39a524a7 100644
--- a/testsuite/systemtap.syscall/trunc.c
+++ b/testsuite/systemtap.syscall/trunc.c
@@ -13,7 +13,7 @@ int main()
 
   fd = creat("foobar",S_IREAD|S_IWRITE);
   ftruncate(fd, 1024);
-  // ftruncate (4, 1024) = 0
+  // ftruncate (NNNN, 1024) = 0
   close(fd);
 
   truncate("foobar", 2048);