git://git.onelab.eu
/
sliver-openvswitch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
d931cde
)
json: Remove write-only variable from json_lex_number().
author
Ben Pfaff
<blp@nicira.com>
Fri, 20 Aug 2010 16:13:20 +0000
(09:13 -0700)
committer
Ben Pfaff
<blp@nicira.com>
Wed, 25 Aug 2010 21:55:47 +0000
(14:55 -0700)
lib/json.c
patch
|
blob
|
history
diff --git
a/lib/json.c
b/lib/json.c
index
d26c89e
..
b08540e
100644
(file)
--- a/
lib/json.c
+++ b/
lib/json.c
@@
-607,7
+607,6
@@
json_lex_number(struct json_parser *p)
const char *cp = ds_cstr(&p->buffer);
unsigned long long int significand = 0;
struct json_token token;
const char *cp = ds_cstr(&p->buffer);
unsigned long long int significand = 0;
struct json_token token;
- int sig_digits = 0;
bool imprecise = false;
bool negative = false;
int pow10 = 0;
bool imprecise = false;
bool negative = false;
int pow10 = 0;
@@
-621,7
+620,6
@@
json_lex_number(struct json_parser *p)
/* At least one integer digit, but 0 may not be used as a leading digit for
* a longer number. */
significand = 0;
/* At least one integer digit, but 0 may not be used as a leading digit for
* a longer number. */
significand = 0;
- sig_digits = 0;
if (*cp == '0') {
cp++;
if (isdigit(*cp)) {
if (*cp == '0') {
cp++;
if (isdigit(*cp)) {
@@
-632,7
+630,6
@@
json_lex_number(struct json_parser *p)
do {
if (significand <= ULLONG_MAX / 10) {
significand = significand * 10 + (*cp - '0');
do {
if (significand <= ULLONG_MAX / 10) {
significand = significand * 10 + (*cp - '0');
- sig_digits++;
} else {
pow10++;
if (*cp != '0') {
} else {
pow10++;
if (*cp != '0') {
@@
-656,7
+653,6
@@
json_lex_number(struct json_parser *p)
do {
if (significand <= ULLONG_MAX / 10) {
significand = significand * 10 + (*cp - '0');
do {
if (significand <= ULLONG_MAX / 10) {
significand = significand * 10 + (*cp - '0');
- sig_digits++;
pow10--;
} else if (*cp != '0') {
imprecise = true;
pow10--;
} else if (*cp != '0') {
imprecise = true;
@@
-719,12
+715,10
@@
json_lex_number(struct json_parser *p)
if (!imprecise) {
while (pow10 > 0 && significand < ULLONG_MAX / 10) {
significand *= 10;
if (!imprecise) {
while (pow10 > 0 && significand < ULLONG_MAX / 10) {
significand *= 10;
- sig_digits++;
pow10--;
}
while (pow10 < 0 && significand % 10 == 0) {
significand /= 10;
pow10--;
}
while (pow10 < 0 && significand % 10 == 0) {
significand /= 10;
- sig_digits--;
pow10++;
}
if (pow10 == 0
pow10++;
}
if (pow10 == 0