X-Git-Url: http://www.project-moonshot.org/gitweb/?p=jansson.git;a=blobdiff_plain;f=src%2Fpack_unpack.c;h=8d8aa33b35065ca55a8845e1d6acfb765b39c277;hp=f91d79c25b7b7e6f27ce2033c0658c0a5eff9ebc;hb=a1c185a376d03b8baee06fc18bfe057ac81cf6d3;hpb=ac96ac13d491f87f5aa8747e208b366c81354a0b diff --git a/src/pack_unpack.c b/src/pack_unpack.c index f91d79c..8d8aa33 100644 --- a/src/pack_unpack.c +++ b/src/pack_unpack.c @@ -380,12 +380,24 @@ static int unpack(scanner_t *s, json_t *root, va_list *ap) return 0; case 'f': - if(!json_is_number(root)) { + if(!json_is_real(root)) { set_error(s, "Expected real, got %s", type_name(root)); return -1; } if(!(s->flags & JSON_VALIDATE_ONLY)) + *va_arg(*ap, double*) = json_real_value(root); + + return 0; + + case 'F': + if(!json_is_number(root)) { + set_error(s, "Expected real or integer, got %s", + type_name(root)); + return -1; + } + + if(!(s->flags & JSON_VALIDATE_ONLY)) *va_arg(*ap, double*) = json_number_value(root); return 0;