bitkeeper revision 1.378 (3f27c2beWNYX6OSWHkL7l2xJ5Qm9ng)

perfc_defn.h, perfc.h, lib.h, vsprintf.c, perfc.c:
  Cleaned up Xen performance counter mechanism.

1 files changed, 0 insertions, 202 deletions

diff --git a/xen/common/vsprintf.c b/xen/common/vsprintf.c
index fe17225088..74285f5406 100644
--- a/xen/common/vsprintf.c
+++ b/xen/common/vsprintf.c
@@ -509,205 +509,3 @@ int sprintf(char * buf, const char *fmt, ...)
     return i;
 }
 
-/**
- * vsscanf - Unformat a buffer into a list of arguments
- * @buf:	input buffer
- * @fmt:	format of buffer
- * @args:	arguments
- */
-int vsscanf(const char * buf, const char * fmt, va_list args)
-{
-    const char *str = buf;
-    char *next;
-    int num = 0;
-    int qualifier;
-    int base;
-    int field_width = -1;
-    int is_sign = 0;
-
-    while(*fmt && *str) {
-        /* skip any white space in format */
-        /* white space in format matchs any amount of
-         * white space, including none, in the input.
-         */
-        if (isspace(*fmt)) {
-            while (isspace(*fmt))
-                ++fmt;
-            while (isspace(*str))
-                ++str;
-        }
-
-        /* anything that is not a conversion must match exactly */
-        if (*fmt != '%' && *fmt) {
-            if (*fmt++ != *str++)
-                break;
-            continue;
-        }
-
-        if (!*fmt)
-            break;
-        ++fmt;
-		
-        /* skip this conversion.
-         * advance both strings to next white space
-         */
-        if (*fmt == '*') {
-            while (!isspace(*fmt) && *fmt)
-                fmt++;
-            while (!isspace(*str) && *str)
-                str++;
-            continue;
-        }
-
-        /* get field width */
-        if (isdigit(*fmt))
-            field_width = skip_atoi(&fmt);
-
-        /* get conversion qualifier */
-        qualifier = -1;
-        if (*fmt == 'h' || *fmt == 'l' || *fmt == 'L' || *fmt == 'Z') {
-            qualifier = *fmt;
-            fmt++;
-        }
-        base = 10;
-        is_sign = 0;
-
-        if (!*fmt || !*str)
-            break;
-
-        switch(*fmt++) {
-        case 'c':
-        {
-            char *s = (char *) va_arg(args,char*);
-            if (field_width == -1)
-                field_width = 1;
-            do {
-                *s++ = *str++;
-            } while(field_width-- > 0 && *str);
-            num++;
-        }
-        continue;
-        case 's':
-        {
-            char *s = (char *) va_arg(args, char *);
-            if(field_width == -1)
-                field_width = INT_MAX;
-            /* first, skip leading white space in buffer */
-            while (isspace(*str))
-                str++;
-
-            /* now copy until next white space */
-            while (*str && !isspace(*str) && field_width--) {
-                *s++ = *str++;
-            }
-            *s = '\0';
-            num++;
-        }
-        continue;
-        case 'n':
-            /* return number of characters read so far */
-        {
-            int *i = (int *)va_arg(args,int*);
-            *i = str - buf;
-        }
-        continue;
-        case 'o':
-            base = 8;
-            break;
-        case 'x':
-        case 'X':
-            base = 16;
-            break;
-        case 'd':
-        case 'i':
-            is_sign = 1;
-        case 'u':
-            break;
-        case '%':
-            /* looking for '%' in str */
-            if (*str++ != '%') 
-                return num;
-            continue;
-        default:
-            /* invalid format; stop here */
-            return num;
-        }
-
-        /* have some sort of integer conversion.
-         * first, skip white space in buffer.
-         */
-        while (isspace(*str))
-            str++;
-
-        if (!*str || !isdigit(*str))
-            break;
-
-        switch(qualifier) {
-        case 'h':
-            if (is_sign) {
-                short *s = (short *) va_arg(args,short *);
-                *s = (short) simple_strtol(str,&next,base);
-            } else {
-                unsigned short *s = (unsigned short *) va_arg(args, unsigned short *);
-                *s = (unsigned short) simple_strtoul(str, &next, base);
-            }
-            break;
-        case 'l':
-            if (is_sign) {
-                long *l = (long *) va_arg(args,long *);
-                *l = simple_strtol(str,&next,base);
-            } else {
-                unsigned long *l = (unsigned long*) va_arg(args,unsigned long*);
-                *l = simple_strtoul(str,&next,base);
-            }
-            break;
-        case 'L':
-            if (is_sign) {
-                long long *l = (long long*) va_arg(args,long long *);
-                *l = simple_strtoll(str,&next,base);
-            } else {
-                unsigned long long *l = (unsigned long long*) va_arg(args,unsigned long long*);
-                *l = simple_strtoull(str,&next,base);
-            }
-            break;
-        case 'Z':
-        {
-            size_t *s = (size_t*) va_arg(args,size_t*);
-            *s = (size_t) simple_strtoul(str,&next,base);
-        }
-        break;
-        default:
-            if (is_sign) {
-                int *i = (int *) va_arg(args, int*);
-                *i = (int) simple_strtol(str,&next,base);
-            } else {
-                unsigned int *i = (unsigned int*) va_arg(args, unsigned int*);
-                *i = (unsigned int) simple_strtoul(str,&next,base);
-            }
-            break;
-        }
-        num++;
-
-        if (!next)
-            break;
-        str = next;
-    }
-    return num;
-}
-
-/**
- * sscanf - Unformat a buffer into a list of arguments
- * @buf:	input buffer
- * @fmt:	formatting of buffer
- * @...:	resulting arguments
- */
-int sscanf(const char * buf, const char * fmt, ...)
-{
-    va_list args;
-    int i;
-
-    va_start(args,fmt);
-    i = vsscanf(buf,fmt,args);
-    va_end(args);
-    return i;
-}