Changeset 102004 in vbox for trunk/src/libs/xpcom18a4

Timestamp:

Nov 8, 2023 7:07:08 PM (15 months ago)

Author:

vboxsync

Message:

libs/xpcom: Drop floating point support from PR_sscanf() as it is not used by now, bugref:10545

File:

• trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prscanf.c (modified) (2 diffs)

trunk/src/libs/xpcom18a4/nsprpub/pr/src/io/prscanf.c

@@ -337 +337 @@
 }
 
-static PRStatus
-GetFloat(ScanfState *state)
-{
-    char buf[FMAX + 1], *p;
-    int ch;
-    PRBool seenDigit = PR_FALSE;
-
-    if (state->width == 0 || state->width > FMAX) {
-        state->width = FMAX;
-    }
-    p = buf;
-    GET_IF_WITHIN_WIDTH(state, ch);
-    if (WITHIN_WIDTH(state) && (ch == '+' || ch == '-')) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-    }
-    while (WITHIN_WIDTH(state) && isdigit(ch)) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-        seenDigit = PR_TRUE;
-    }
-    if (WITHIN_WIDTH(state) && ch == DECIMAL_POINT) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-        while (WITHIN_WIDTH(state) && isdigit(ch)) {
-            *p++ = ch;
-            GET_IF_WITHIN_WIDTH(state, ch);
-            seenDigit = PR_TRUE;
-        }
-    }
-
-    /*
-     * This is not robust.  For example, "1.2e+" would confuse
-     * the code below to read 'e' and '+', only to realize that
-     * it should have stopped at "1.2".  But we can't push back
-     * more than one character, so there is nothing I can do.
-     */
-
-    /* Parse exponent */
-    if (WITHIN_WIDTH(state) && (ch == 'e' || ch == 'E') && seenDigit) {
-        *p++ = ch;
-        GET_IF_WITHIN_WIDTH(state, ch);
-        if (WITHIN_WIDTH(state) && (ch == '+' || ch == '-')) {
-            *p++ = ch;
-            GET_IF_WITHIN_WIDTH(state, ch);
-        }
-        while (WITHIN_WIDTH(state) && isdigit(ch)) {
-            *p++ = ch;
-            GET_IF_WITHIN_WIDTH(state, ch);
-        }
-    }
-    if (WITHIN_WIDTH(state)) {
-        UNGET(state, ch);
-    }
-    if (!seenDigit) {
-        return PR_FAILURE;
-    }
-    *p = '\0';
-    if (state->assign) {
-        PRFloat64 dval = PR_strtod(buf, NULL);
-
-        state->converted = PR_TRUE;
-        if (state->sizeSpec == _PR_size_l) {
-            *va_arg(state->ap, PRFloat64 *) = dval;
-        } else if (state->sizeSpec == _PR_size_L) {
-#if defined(OSF1) || defined(IRIX)
-            *va_arg(state->ap, double *) = dval;
-#else
-            *va_arg(state->ap, long double *) = dval;
-#endif
-        } else {
-            *va_arg(state->ap, float *) = (float) dval;
-        }
-    }
-    return PR_SUCCESS;
-}
-
 /*
  * Convert, and return the end of the conversion spec.
@@ -463 +386 @@
         case 'e': case 'E': case 'f':
         case 'g': case 'G':
-            if (GetFloat(state) == PR_FAILURE) {
-                return NULL;
-            }
+            /** @todo r=aeichner
+             * PR_sscanf is only called in one point by now and it doesn't parse any floats,
+             * and it will hopefully go away soon anyway.
+             */
+            AssertReleaseFailed();
+            return NULL;
             break;
         case 'n':