[Ltp-cvs] ltp/testcases/kernel/syscalls/signal signal01.c, 1.10, 1.11

[Mike F. <va...@us...>]

Update of /cvsroot/ltp/ltp/testcases/kernel/syscalls/signal
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv18205

Modified Files:
	signal01.c 
Log Message:
remove useless sprintf indirection

Index: signal01.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/syscalls/signal/signal01.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** signal01.c	23 Mar 2009 13:36:04 -0000	1.10
--- signal01.c	28 Aug 2009 13:58:53 -0000	1.11
***************
*** 203,207 ****
  int exit_val;			/* Global variable, used to tell whether the    */
  			/* child exited instead of being killed.        */
- char mesg[MAXMESG];		/* Holds messages to pass to tst_res.           */
  
  struct ipc_t {
--- 203,206 ----
***************
*** 306,314 ****
  	 */
  	if (pipe(fd1) == -1) {
! 		sprintf(mesg,
! 			"pipe system call failed, Errno: %d, Error message: %s",
! 			errno, strerror(errno));
! 		tst_resm(TBROK, mesg);
! 		tst_resm(TBROK, mesg);
  		return;
  	}
--- 305,309 ----
  	 */
  	if (pipe(fd1) == -1) {
! 		tst_resm(TBROK|TERRNO, "pipe() failed");
  		return;
  	}
***************
*** 320,328 ****
  
  	if (fcntl(fd1[0], F_SETFL, O_NONBLOCK) == -1) {
! 		sprintf(mesg,
! 			"fcntl(fd1[0], F_SETFL, O_NONBLOCK) failed: errno=%d",
! 			errno);
! 		tst_resm(TBROK, mesg);
! 		tst_resm(TBROK, mesg);
  		close(fd1[0]);
  		close(fd1[1]);
--- 315,319 ----
  
  	if (fcntl(fd1[0], F_SETFL, O_NONBLOCK) == -1) {
! 		tst_resm(TBROK|TERRNO, "fcntl(fd1[0], F_SETFL, O_NONBLOCK) failed");
  		close(fd1[0]);
  		close(fd1[1]);
***************
*** 354,361 ****
  
  			if (rd_sz == 0) {	/* if EOF encountered */
! 				sprintf(mesg,
! 					"child's pipe is closed before 'go' message received");
! 				tst_resm(TBROK, Ipc_info.mesg);
! 				tst_resm(TBROK, Ipc_info.mesg);
  				close(fd1[0]);
  				return;
--- 345,349 ----
  
  			if (rd_sz == 0) {	/* if EOF encountered */
! 				tst_resm(TBROK, "child's pipe is closed before 'go' message received");
  				close(fd1[0]);
  				return;
***************
*** 386,390 ****
  				tst_resm(TINFO,
  					 "Unknown message from child: %s",
! 					 mesg);
  			}
  		}
--- 374,378 ----
  				tst_resm(TINFO,
  					 "Unknown message from child: %s",
! 					 Ipc_info.mesg);
  			}
  		}
***************
*** 394,405 ****
  		 */
  		if (kill(Pid, SIGKILL) == -1) {
! 			/*
! 			 * The kill system call failed.
! 			 */
! 			sprintf(mesg,
! 				"kill(Pid,SIGKILL) failed, Errno: %d, Error message: %s",
! 				errno, strerror(errno));
! 			tst_resm(TBROK, mesg);
! 			tst_resm(TBROK, mesg);
  			close(fd1[0]);
  			return;
--- 382,386 ----
  		 */
  		if (kill(Pid, SIGKILL) == -1) {
! 			tst_resm(TBROK|TERRNO, "kill(%d) failed", Pid);
  			close(fd1[0]);
  			return;
***************
*** 413,421 ****
  			 * The wait system call failed.
  			 */
! 			sprintf(mesg,
! 				"Wait system call failed. Errno: %d, Error message: %s",
! 				errno, strerror(errno));
! 			tst_resm(TBROK, mesg);
! 			tst_resm(TBROK, mesg);
  			close(fd1[0]);
  			return;
--- 394,398 ----
  			 * The wait system call failed.
  			 */
! 			tst_resm(TBROK|TERRNO, "wait() failed");
  			close(fd1[0]);
  			return;
***************
*** 429,450 ****
  					 "The child was killed by SIGKILL.");
  			} else if ((term_stat >> 8) == TIMED_OUT) {
! 				sprintf(mesg,
! 					"child exited with a timed out exit status");
! 				tst_resm(TBROK, mesg);
  			} else {
  				if ((term_stat >> 8) == SIG_IGNORED
  				    && test_case == IGNORE_TEST) {
! 					sprintf(mesg,
! 						"SIGKILL was ignored by child after sent by parent.");
  				} else if ((term_stat >> 8) == SIG_CAUGHT
  					   && test_case == CATCH_TEST) {
! 					sprintf(mesg,
! 						"SIGKILL was caught by child after sent by parent.");
  				} else {
! 					sprintf(mesg,
  						"Child's termination status is unexpected. Status: %d (%#o).",
  						term_stat, term_stat);
  				}
- 				tst_resm(TFAIL, mesg);
  			}
  		} else {
--- 406,422 ----
  					 "The child was killed by SIGKILL.");
  			} else if ((term_stat >> 8) == TIMED_OUT) {
! 				tst_resm(TBROK, "child exited with a timed out exit status");
  			} else {
  				if ((term_stat >> 8) == SIG_IGNORED
  				    && test_case == IGNORE_TEST) {
! 					tst_resm(TFAIL, "SIGKILL was ignored by child after sent by parent.");
  				} else if ((term_stat >> 8) == SIG_CAUGHT
  					   && test_case == CATCH_TEST) {
! 					tst_resm(TFAIL, "SIGKILL was caught by child after sent by parent.");
  				} else {
! 					tst_resm(TFAIL,
  						"Child's termination status is unexpected. Status: %d (%#o).",
  						term_stat, term_stat);
  				}
  			}
  		} else {
***************
*** 461,467 ****
  #ifdef UCLINUX
  		if (self_exec(argv0, "dd", test_case, fd1[1]) < 0) {
! 			sprintf(mesg, "self_exec failed.");
! 			tst_resm(TBROK, mesg);
! 			tst_resm(TBROK, mesg);
  			close(fd1[0]);
  			close(fd1[1]);
--- 433,437 ----
  #ifdef UCLINUX
  		if (self_exec(argv0, "dd", test_case, fd1[1]) < 0) {
! 			tst_resm(TBROK|TERRNO, "self_exec() failed");
  			close(fd1[0]);
  			close(fd1[1]);
***************
*** 474,485 ****
  	} /* End of child. */
  	else {
! 		/*
! 		 * The fork system call failed.
! 		 */
! 		sprintf(mesg,
! 			"Fork system call failed. Errno: %d, Error message: %s",
! 			errno, strerror(errno));
! 		tst_resm(TBROK, mesg);
! 		tst_resm(TBROK, mesg);
  		close(fd1[0]);
  		close(fd1[1]);
--- 444,448 ----
  	} /* End of child. */
  	else {
! 		tst_resm(TBROK|TERRNO, "fork() failed");
  		close(fd1[0]);
  		close(fd1[1]);
***************
*** 519,523 ****
  		} else {
  			sprintf(Ipc_info.mesg,
! 				"%s ret:%p, errno:%ld expected ret:%ld, errno:%d",
  				string, Tret, TEST_ERRNO, (long)SIG_ERR,
  				EINVAL);
--- 482,486 ----
  		} else {
  			sprintf(Ipc_info.mesg,
! 				"%s ret:%p, errno:%d expected ret:%ld, errno:%d",
  				string, Tret, TEST_ERRNO, (long)SIG_ERR,
  				EINVAL);
***************
*** 532,536 ****
  		 */
  		sprintf(Ipc_info.mesg,
! 			"%s ret:%p, errno:%ld expected ret:%ld, errno:%d",
  			string, Tret, TEST_ERRNO, (long)SIG_ERR, EINVAL);
  		Ipc_info.status = FAIL_FLAG;
--- 495,499 ----
  		 */
  		sprintf(Ipc_info.mesg,
! 			"%s ret:%p, errno:%d expected ret:%ld, errno:%d",
  			string, Tret, TEST_ERRNO, (long)SIG_ERR, EINVAL);
  		Ipc_info.status = FAIL_FLAG;
***************
*** 585,605 ****
  		if (STD_FUNCTIONAL_TEST) {
  			if (TEST_ERRNO != EINVAL) {
! 				sprintf(mesg,
! 					"signal(SIGKILL,SIG_DFL) ret:%p, errno:%ld expected ret:-1, errno:%d",
! 					Tret, TEST_ERRNO, EINVAL);
! 				tst_resm(TFAIL, mesg);
  			} else {
! 				sprintf(mesg,
! 					"signal(SIGKILL,SIG_DFL) ret:%p, errno:%ld as expected.",
! 					Tret, TEST_ERRNO);
! 				tst_resm(TPASS, mesg);
  			}
  		} else
  			Tst_count++;
  	} else {
! 		sprintf(mesg,
! 			"signal(SIGKILL,SIG_DFL) ret:%p, errno:%ld expected ret:-1, errno:%d",
  			Tret, TEST_ERRNO, EINVAL);
- 		tst_resm(TFAIL, mesg);
  	}
  
--- 548,565 ----
  		if (STD_FUNCTIONAL_TEST) {
  			if (TEST_ERRNO != EINVAL) {
! 				tst_resm(TFAIL|TTERRNO,
! 					"signal(SIGKILL,SIG_DFL) expected ret:-1, errno:EINVAL, got ret:%p",
! 					Tret);
  			} else {
! 				tst_resm(TPASS,
! 					"signal(SIGKILL,SIG_DFL) ret:%p, errno EINVAL as expected",
! 					Tret);
  			}
  		} else
  			Tst_count++;
  	} else {
! 		tst_resm(TFAIL,
! 			"signal(SIGKILL,SIG_DFL) ret:%p, errno:%d expected ret:-1, errno:%d",
  			Tret, TEST_ERRNO, EINVAL);
  	}