X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fvsprintf.c;h=b1f5c9deede5f32ef90cebfe8ec064248eb42a09;hb=902d44426afe46356253fe93d8cef2b4d9f236f3;hp=0b0935915066aa33841feab4f547be008621bcb6;hpb=a91482bdcc2e0f6035702e46f1b99043a0893346;p=linux-2.6.git

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0b0935915..b1f5c9dee 100644
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -668,16 +668,8 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
 		qualifier = -1;
 		if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' ||
 		    *fmt == 'Z' || *fmt == 'z') {
-			qualifier = *fmt++;
-			if (unlikely(qualifier == *fmt)) {
-				if (qualifier == 'h') {
-					qualifier = 'H';
-					fmt++;
-				} else if (qualifier == 'l') {
-					qualifier = 'L';
-					fmt++;
-				}
-			}
+			qualifier = *fmt;
+			fmt++;
 		}
 		base = 10;
 		is_sign = 0;
@@ -762,15 +754,6 @@ int vsscanf(const char * buf, const char * fmt, va_list args)
 				break;
 
 		switch(qualifier) {
-		case 'H':	/* that's 'hh' in format */
-			if (is_sign) {
-				signed char *s = (signed char *) va_arg(args,signed char *);
-				*s = (signed char) simple_strtol(str,&next,base);
-			} else {
-				unsigned char *s = (unsigned char *) va_arg(args, unsigned char *);
-				*s = (unsigned char) simple_strtoul(str, &next, base);
-			}
-			break;
 		case 'h':
 			if (is_sign) {
 				short *s = (short *) va_arg(args,short *);