# HG changeset patch # User reimar # Date 1267648595 0 # Node ID 106543495f5b5f3e91c08cdf515a07d348c53dbf # Parent dc08ce042315187e23e4413d65689f62718397c0 Simplify sscanf format strings and get rid of useless percent variable. diff -r dc08ce042315 -r 106543495f5b libvo/geometry.c --- a/libvo/geometry.c Wed Mar 03 20:24:46 2010 +0000 +++ b/libvo/geometry.c Wed Mar 03 20:36:35 2010 +0000 @@ -40,7 +40,6 @@ int i; int ok = 0; for (i = 0; !ok && i < 8; i++) { - char percent[2]; width = height = xoff = yoff = xper = yper = INT_MIN; switch (i) { case 0: @@ -53,10 +52,10 @@ ok = sscanf(vo_geometry, "+%i+%i", &xoff, &yoff) == 2; break; case 3: - ok = sscanf(vo_geometry, "%i%%:%i%1[%]", &xper, &yper, percent) == 3; + ok = sscanf(vo_geometry, "%i%%:%i%%", &xper, &yper) == 2; break; case 4: - ok = sscanf(vo_geometry, "%i:%i%1[%]", &xoff, &yper, percent) == 3; + ok = sscanf(vo_geometry, "%i:%i%%", &xoff, &yper) == 2; break; case 5: ok = sscanf(vo_geometry, "%i%%:%i", &xper, &yoff) == 2; @@ -65,7 +64,7 @@ ok = sscanf(vo_geometry, "%i:%i", &xoff, &yoff) == 2; break; case 7: - ok = sscanf(vo_geometry, "%i%1[%]", &xper, percent) == 2; + ok = sscanf(vo_geometry, "%i%%", &xper) == 1; break; } }