summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-14 14:23:55 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2008-02-14 14:23:55 +0000
commit835c654bb0089933c5dd85a8ca123581cda1169e (patch)
treea49757d0460577d3b70c63bf9a36ec714ff3a81a /input
parent440d7d25755bc850b7ee58e88e2bd8d6c18baea7 (diff)
downloadmpv-835c654bb0089933c5dd85a8ca123581cda1169e.tar.bz2
mpv-835c654bb0089933c5dd85a8ca123581cda1169e.tar.xz
typo fix: inited --> initialized
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/ar.c12
-rw-r--r--input/joystick.c6
2 files changed, 9 insertions, 9 deletions
diff --git a/input/ar.c b/input/ar.c
index 5b5659157f..7347b4c326 100644
--- a/input/ar.c
+++ b/input/ar.c
@@ -106,7 +106,7 @@ static const cookie_keycode_map_t *ar_codes;
static IOHIDQueueInterface **queue;
static IOHIDDeviceInterface **hidDeviceInterface = NULL;
-static int inited = 0;
+static int initialized = 0;
static int hidDeviceIsOpen;
/* Maximum number of elements in queue before oldest elements
@@ -221,7 +221,7 @@ int mp_input_ar_init(void)
IOHIDElementCookie *cookies = NULL;
int nr_cookies = 0;
- if (inited)
+ if (initialized)
mp_input_ar_close(-1);
if (floor(NSAppKitVersionNumber) <= 824 /* NSAppKitVersionNumber10_4 */) {
@@ -286,7 +286,7 @@ int mp_input_ar_init(void)
// not useful anymore
IOObjectRelease(hidObjectIterator);
- inited = 1;
+ initialized = 1;
return 0;
mp_input_ar_init_error:
@@ -335,7 +335,7 @@ int mp_input_ar_read(int fd)
char cookie_queue[MAX_QUEUE_SIZE];
int value_queue[MAX_QUEUE_SIZE];
- if (inited == 0)
+ if (initialized == 0)
return MP_INPUT_NOTHING;
while ((result = (*queue)->getNextEvent(queue, &event, zeroTime, 0)) == kIOReturnSuccess) {
@@ -415,7 +415,7 @@ int mp_input_ar_read(int fd)
void mp_input_ar_close(int fd)
{
- if (inited == 0)
+ if (initialized == 0)
return;
// Close the device.
@@ -431,7 +431,7 @@ void mp_input_ar_close(int fd)
// Release the interface.
(*hidDeviceInterface)->Release(hidDeviceInterface);
- inited = 0;
+ initialized = 0;
}
#ifdef TEST
diff --git a/input/joystick.c b/input/joystick.c
index 312cd90f4d..0fb2c041ed 100644
--- a/input/joystick.c
+++ b/input/joystick.c
@@ -33,7 +33,7 @@ int btns = 0;
int mp_input_joystick_init(char* dev) {
int fd,l=0;
- int inited = 0;
+ int initialized = 0;
struct js_event ev;
mp_msg(MSGT_INPUT,MSGL_V,MSGTR_INPUT_JOYSTICK_Opening,dev ? dev : JS_DEV);
@@ -44,7 +44,7 @@ int mp_input_joystick_init(char* dev) {
return -1;
}
- while(! inited) {
+ while(! initialized) {
l = 0;
while((unsigned int)l < sizeof(struct js_event)) {
int r = read(fd,((char*)&ev)+l,sizeof(struct js_event)-l);
@@ -52,7 +52,7 @@ int mp_input_joystick_init(char* dev) {
if(errno == EINTR)
continue;
else if(errno == EAGAIN) {
- inited = 1;
+ initialized = 1;
break;
}
mp_msg(MSGT_INPUT,MSGL_ERR,MSGTR_INPUT_JOYSTICK_ErrReading,strerror(errno));