From dcd9ee6d5ab6c57fec3abd529e8de40a8cc609a0 Mon Sep 17 00:00:00 2001 From: uau Date: Sat, 25 Aug 2007 04:28:06 +0000 Subject: [PATCH] Remove unused function The only case which does not override mp_input_default_key_func in mp_input_add_key_fd() is fd 0, but that is later special-cased not to use the input function at all. Remove the useless default function. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24148 b3059339-0415-0410-9bf9-f77b7e298cf2 --- input/input.c | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/input/input.c b/input/input.c index 2e9bbc97f2..40cc34ed6b 100644 --- a/input/input.c +++ b/input/input.c @@ -585,9 +585,6 @@ static m_option_t mp_input_opts[] = { { NULL, NULL, 0, 0, 0, 0, NULL} }; -static int -mp_input_default_key_func(int fd); - static int mp_input_default_cmd_func(int fd,char* buf, int l); @@ -659,7 +656,7 @@ mp_input_add_key_fd(int fd, int select, mp_key_func_t read_func, mp_close_func_t memset(&key_fds[num_key_fd],0,sizeof(mp_input_fd_t)); key_fds[num_key_fd].fd = fd; - key_fds[num_key_fd].read_func = read_func ? read_func : mp_input_default_key_func; + key_fds[num_key_fd].read_func = read_func; key_fds[num_key_fd].close_func = close_func; key_fds[num_key_fd].no_select = !select; num_key_fd++; @@ -803,20 +800,6 @@ mp_input_parse_cmd(char* str) { return cmd; } -static int -mp_input_default_key_func(int fd) { - int r,code=0; - unsigned int l; - l = 0; - while(l < sizeof(int)) { - r = read(fd,((char *)&code)+l,sizeof(int)-l); - if(r <= 0) - break; - l +=r; - } - return code; -} - #define MP_CMD_MAX_SIZE 256 static int