[Mplayer-cvslog] CVS: main/input input.c,1.37,1.38

Alban Bedel CVS albeu at mplayerhq.hu
Wed Jun 19 18:41:47 CEST 2002


Update of /cvsroot/mplayer/main/input
In directory mail:/var/tmp.root/cvs-serv10492/input

Modified Files:
	input.c 
Log Message:
10L forgot to close input.conf fd


Index: input.c
===================================================================
RCS file: /cvsroot/mplayer/main/input/input.c,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- input.c	12 Jun 2002 10:39:04 -0000	1.37
+++ input.c	19 Jun 2002 16:41:38 -0000	1.38
@@ -1108,6 +1108,7 @@
 	  continue;
 	mp_msg(MSGT_INPUT,MSGL_ERR,"Error while reading input config file %s : %s\n",file,strerror(errno));
 	mp_input_free_binds(binds);
+	close(fd);
 	return 0;
       } else if(r == 0) 
 	eof = 1;
@@ -1121,6 +1122,7 @@
       mp_msg(MSGT_INPUT,MSGL_INFO,"Input config file %s parsed : %d binds\n",file,n_binds);
       if(binds)
 	cmd_binds = binds;
+      close(fd);
       return 1;
     }
 
@@ -1179,6 +1181,7 @@
 	if(! mp_input_get_input_from_name(name,keys)) {
 	  mp_msg(MSGT_INPUT,MSGL_ERR,"Unknown key '%s'\n",name);
 	  mp_input_free_binds(binds);
+	  close(fd);
 	  return 0;
 	}
       }
@@ -1208,6 +1211,7 @@
 	if(iter == buffer) {
 	  mp_msg(MSGT_INPUT,MSGL_ERR,"Buffer is too small for command %s\n",buffer);
 	  mp_input_free_binds(binds);
+	  close(fd);
 	  return 0;
 	}
 	memmove(buffer,iter,end - iter);
@@ -1232,6 +1236,7 @@
     }
   }
   mp_msg(MSGT_INPUT,MSGL_ERR,"What are we doing here ?\n");
+  close(fd);
   return 0;
 }
 




More information about the MPlayer-cvslog mailing list