# HG changeset patch # User albeu # Date 1012834998 0 # Node ID c619a7271690c23d3aba736e1f07145383e2b88d # Parent 46c4e34b4e7669864d7923f41fdd72417a68d546 Remove some unuseful stuff and don't try to kill an unexisting child process on uninit diff -r 46c4e34b4e76 -r c619a7271690 input/lirc.c --- a/input/lirc.c Mon Feb 04 14:48:32 2002 +0000 +++ b/input/lirc.c Mon Feb 04 15:03:18 2002 +0000 @@ -33,7 +33,6 @@ int mp_input_lirc_init(void) { - int lirc_flags; int lirc_sock; int p[2]; @@ -43,19 +42,6 @@ return -1; } -#if 0 - fcntl(lirc_sock,F_SETOWN,getpid()); - lirc_flags=fcntl(lirc_sock,F_GETFL,0); - if(lirc_flags!=-1) { - fcntl(lirc_sock,F_SETFL,lirc_flags|O_NONBLOCK); - } else { - lirc_deinit(); - mp_msg(MSGT_LIRC,MSGL_ERR,MSGTR_LIRCsocketerr MSGTR_LIRCdisabled,strerror(errno)); - return -1; - } -#endif - - if(lirc_readconfig( lirc_configfile,&lirc_config,NULL )!=0 ){ mp_msg(MSGT_LIRC,MSGL_ERR,MSGTR_LIRCcfgerr MSGTR_LIRCdisabled, lirc_configfile == NULL ? "~/.lircrc" : lirc_configfile); @@ -137,6 +123,8 @@ void mp_input_lirc_uninit(void) { + if(child_pid <= 0) + return; if( kill(child_pid,SIGQUIT) != 0) { mp_msg(MSGT_LIRC,MSGL_V,"LIRC can't kill subprocess %d : %s\n", child_pid,strerror(errno));