This commit was manufactured by cvs2svn to create tag

[linux-2.6.git] / lib / vsprintf.c

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index 0b09359..b1f5c9d 100644 (file)
--- 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 *);