RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

getch2: move global state to file scope variables 

Using static variables for mutable state inside functions is a bad idea,
because it's not immediately obvious that it is what it is.
This commit is contained in:
wm4 2013-10-28 23:29:08 +01:00
parent 40e68d6514
commit e10b362bdb
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
osdep/getch2.c
View File

@ -340,6 +340,11 @@ void get_screen_size(void) {
static unsigned char getch2_buf[BUF_LEN];
static int getch2_len = 0;
static int getch2_pos = 0;
static enum {
STATE_INITIAL,
STATE_UTF8,
} state = STATE_INITIAL;
static int utf8_len = 0;
static void walk_buf(unsigned int count) {
if (!(count < BUF_LEN && count <= getch2_len))
@ -365,12 +370,6 @@ bool getch2(struct input_ctx *input_ctx)
return retval;
getch2_len += retval;
static enum {
STATE_INITIAL = 0,
STATE_UTF8,
} state = STATE_INITIAL;
static int utf8_len = 0;
while (getch2_pos < getch2_len) {
unsigned char c = getch2_buf[getch2_pos++];