mirror of https://github.com/mpv-player/mpv
input/ar.c, input/lirc.c: fix changes missing from 1916b95b8
1916b95b8
changed two function types from returning "void" to
returning "int", but was missing changes to add "return 0;" to the
functions. Fix.
The reason for the change in the original commit was that the
functions were called through a function pointer returning int anyway,
so the missing return probably made things no more likely to fail at
runtime than they were before that commit. However, it caused a
compilation failure with clang, which treats non-void function not
returning a value as a fatal error (in GCC it's just a warning).
This commit is contained in:
parent
83fc5b6004
commit
79469244f7
|
@ -415,7 +415,7 @@ int mp_input_ar_read(void *ctx, int fd)
|
|||
int mp_input_ar_close(int fd)
|
||||
{
|
||||
if (initialized == 0)
|
||||
return;
|
||||
return 0;
|
||||
|
||||
// Close the device.
|
||||
(*hidDeviceInterface)->close(hidDeviceInterface);
|
||||
|
@ -431,6 +431,7 @@ int mp_input_ar_close(int fd)
|
|||
(*hidDeviceInterface)->Release(hidDeviceInterface);
|
||||
|
||||
initialized = 0;
|
||||
return 0;
|
||||
}
|
||||
|
||||
#ifdef TEST
|
||||
|
|
|
@ -119,4 +119,5 @@ int mp_input_lirc_close(int fd)
|
|||
cmd_buf = NULL;
|
||||
lirc_freeconfig(lirc_config);
|
||||
lirc_deinit();
|
||||
return 0;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue