[Mplayer-cvslog] CVS: main cfgparser.c,1.14,1.15

Szabolcs Berecz szabii at users.sourceforge.net
Wed Apr 11 02:17:10 CEST 2001


Update of /cvsroot/mplayer/main
In directory usw-pr-cvs1:/tmp/cvs-serv31906

Modified Files:
	cfgparser.c 
Log Message:
less output

Index: cfgparser.c
===================================================================
RCS file: /cvsroot/mplayer/main/cfgparser.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** cfgparser.c	2001/03/22 18:52:45	1.14
--- cfgparser.c	2001/04/11 00:17:08	1.15
***************
*** 1,4 ****
--- 1,6 ----
  /*
   * command line and config file parser
+  * by Szabolcs Berecz <szabi at inf.elte.hu>
+  * (C) 2001
   */
  
***************
*** 11,14 ****
--- 13,17 ----
  #include <fcntl.h>
  #include <string.h>
+ #include <errno.h>
  
  #define ERR_NOT_AN_OPTION	-1
***************
*** 249,253 ****
  	}		
  
! 	printf("Reading config file: %s\n", conffile);
  
  	if (init_conf(conf, CONFIG_FILE) == -1) {
--- 252,256 ----
  	}		
  
! 	printf("Reading config file: %s", conffile);
  
  	if (init_conf(conf, CONFIG_FILE) == -1) {
***************
*** 257,261 ****
  
  	if ((line = (char *) malloc(MAX_LINE_LEN + 1)) == NULL) {
! 		perror("parse_config_file: can't get memory for 'line'");
  		ret = -1;
  		goto out;
--- 260,264 ----
  
  	if ((line = (char *) malloc(MAX_LINE_LEN + 1)) == NULL) {
! 		perror("\ncan't get memory for 'line'");
  		ret = -1;
  		goto out;
***************
*** 263,271 ****
  
  	if ((fp = fopen(conffile, "r")) == NULL) {
! 		perror("parse_config_file: can't open filename");
  		free(line);
  		ret = 0;
  		goto out;
  	}
  
  	while (fgets(line, MAX_LINE_LEN, fp)) {
--- 266,275 ----
  
  	if ((fp = fopen(conffile, "r")) == NULL) {
! 		printf(": %s\n", strerror(errno));
  		free(line);
  		ret = 0;
  		goto out;
  	}
+ 	printf("\n");
  
  	while (fgets(line, MAX_LINE_LEN, fp)) {
***************
*** 427,431 ****
  				found_filename = 1;
  				*filename = argv[i];
- 				printf("parse_command_line: found filename: %s\n", *filename);
  				continue;	/* next option */
  			}
--- 431,434 ----


_______________________________________________
Mplayer-cvslog mailing list
Mplayer-cvslog at lists.sourceforge.net
http://lists.sourceforge.net/lists/listinfo/mplayer-cvslog



More information about the MPlayer-cvslog mailing list