[Ltp-cvs] ltp/testcases/kernel/ipc/ipc_stress message_queue_test_04.c,1.2,1.3

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

Update of /cvsroot/ltp/ltp/testcases/kernel/ipc/ipc_stress
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20930/testcases/kernel/ipc/ipc_stress

Modified Files:
	message_queue_test_04.c 
Log Message:
Applied patch from Mike Frysinger:
newer toolchains complain about redefining 'log' since it's a math function 
provided by the libc

find attached a simple patch to rename the 'log' variable in 
testcases/kernel/ipc/ipc_stress/message_queue_test_04.c to 'logit'
-mike


Index: message_queue_test_04.c
===================================================================
RCS file: /cvsroot/ltp/ltp/testcases/kernel/ipc/ipc_stress/message_queue_test_04.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** message_queue_test_04.c	28 May 2002 16:26:16 -0000	1.2
--- message_queue_test_04.c	2 Aug 2005 17:10:40 -0000	1.3
***************
*** 98,102 ****
   */
  int	verbose	= 0;
! int	log	= 0;
  FILE	*logfile;
  char	*log_filename = NULL;
--- 98,102 ----
   */
  int	verbose	= 0;
! int	logit	= 0;
  FILE	*logfile;
  char	*log_filename = NULL;
***************
*** 127,131 ****
  	 */
  	parse_args (argc, argv);
! 	if (log) {
  		if ((logfile = fopen (log_filename, "w")) == NULL)
  			sys_error ("msgget failed", __LINE__);
--- 127,131 ----
  	 */
  	parse_args (argc, argv);
! 	if (logit) {
  		if ((logfile = fopen (log_filename, "w")) == NULL)
  			sys_error ("msgget failed", __LINE__);
***************
*** 136,140 ****
  	 */
  	printf ("%s: IPC Message Queue TestSuite program\n\n", *argv);
! 	if (log)
  		fprintf (logfile, "%s: IPC Message Queue TestSuite program\n\n", *argv);
  
--- 136,140 ----
  	 */
  	printf ("%s: IPC Message Queue TestSuite program\n\n", *argv);
! 	if (logit)
  		fprintf (logfile, "%s: IPC Message Queue TestSuite program\n\n", *argv);
  
***************
*** 147,151 ****
  	if (verbose)
  		printf ("\tCreated message queue: %d\n\n", msqid);
! 	if (log)
  		fprintf (logfile, "\tCreated message queue: %d\n\n", msqid);
  
--- 147,151 ----
  	if (verbose)
  		printf ("\tCreated message queue: %d\n\n", msqid);
! 	if (logit)
  		fprintf (logfile, "\tCreated message queue: %d\n\n", msqid);
  
***************
*** 175,179 ****
  		printf ("\tCorresponding message size:  %ld\n\n", (long)msg_size);
  	}
! 	if (log) {
  		fprintf (logfile, "\tMax num of bytes per queue:  %ld\n",  (long)max_bytes);
  		fprintf (logfile, "\tMax messages per queue:      %d\n",  MAX_MSGS);
--- 175,179 ----
  		printf ("\tCorresponding message size:  %ld\n\n", (long)msg_size);
  	}
! 	if (logit) {
  		fprintf (logfile, "\tMax num of bytes per queue:  %ld\n",  (long)max_bytes);
  		fprintf (logfile, "\tMax messages per queue:      %d\n",  MAX_MSGS);
***************
*** 202,206 ****
  	}
  	if (verbose) puts ("\n");
! 	if (log) fprintf (logfile, "\tBytes sent: %ld\n", (long)bytes_sent);
  	//free (buf);
  
--- 202,206 ----
  	}
  	if (verbose) puts ("\n");
! 	if (logit) fprintf (logfile, "\tBytes sent: %ld\n", (long)bytes_sent);
  	//free (buf);
  
***************
*** 212,221 ****
  	if (verbose)
  		printf ("\n\tRemoved message queue: %d\n", msqid);
! 	if (log)
  		fprintf (logfile, "\n\tRemoved message queue: %d\n", msqid);
  
  	/* Program completed successfully -- exit */
  	printf ("\nsuccessful!\n");
! 	if (log) {
  		fprintf (logfile, "\nsuccessful!\n");
  		fclose (logfile);
--- 212,221 ----
  	if (verbose)
  		printf ("\n\tRemoved message queue: %d\n", msqid);
! 	if (logit)
  		fprintf (logfile, "\n\tRemoved message queue: %d\n", msqid);
  
  	/* Program completed successfully -- exit */
  	printf ("\nsuccessful!\n");
! 	if (logit) {
  		fprintf (logfile, "\nsuccessful!\n");
  		fclose (logfile);
***************
*** 257,261 ****
  				break;
  			case 'l':	/* log file */
! 				log++;
  				log_filename = optarg;
  				break;
--- 257,261 ----
  				break;
  			case 'l':	/* log file */
! 				logit++;
  				log_filename = optarg;
  				break;
***************
*** 298,302 ****
  {
  	fprintf (stderr, "ERROR [line: %d] %s\n", line, msg);
! 	if (log)
  		fprintf (logfile, "ERROR [line: %d] %s\n", line, msg);
  	exit (-1);
--- 298,302 ----
  {
  	fprintf (stderr, "ERROR [line: %d] %s\n", line, msg);
! 	if (logit)
  		fprintf (logfile, "ERROR [line: %d] %s\n", line, msg);
  	exit (-1);