Mercurial > mplayer.hg

changeset 35258:109f7c33a9b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Simplify mp_input_get_input_from_name.
author reimar
date Mon, 05 Nov 2012 21:22:14 +0000
parents 9a46ec65165d
children 7e835c67cf86
files input/input.c
diffstat 1 files changed, 5 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/input/input.c	Mon Nov 05 21:02:38 2012 +0000
+++ b/input/input.c	Mon Nov 05 21:22:14 2012 +0000
@@ -1491,26 +1491,22 @@
 
 static int
 mp_input_get_input_from_name(char* name,int* keys) {
-  char *end,*ptr;
+  char *ptr;
   int n=0;
 
   ptr = name;
-  n = 0;
-  for(end = strchr(ptr,'-') ; ptr != NULL ; end = strchr(ptr,'-')) {
+  for(n = 0; ptr && *ptr && n < MP_MAX_KEY_DOWN; n++) {
+    char *end = strchr(ptr,'-');
     if(end && end[1] != '\0') {
       if(end[1] == '-')
-	end = &end[1];
+        end++;
       end[0] = '\0';
     }
     keys[n] = mp_input_get_key_from_name(ptr);
     if(keys[n] < 0) {
       return 0;
     }
-    n++;
-    if(end && end[1] != '\0' && n < MP_MAX_KEY_DOWN)
-      ptr = &end[1];
-    else
-      break;
+    ptr = end + !!end;
   }
   keys[n] = 0;
   return 1;