| Message ID | a38b25541002072327ve3fb154t2bce9e9f81231ae6@mail.gmail.com |
|---|---|
| State | New |
| Headers | show |
2010/2/8 TeLeMan <geleman@gmail.com>: > The json parser does not support "%I64d", so we have to use "%lld" > instead of "%I64d". > We use PRId64 with json in more places besides migration.c and monitor.c, adding %I64d support in json lexer/parser is a better choice IMO. > Signed-off-by: TeLeMan <geleman@gmail.com> > --- > migration.c | 6 +++--- > monitor.c | 4 ++-- > 2 files changed, 5 insertions(+), 5 deletions(-) > > diff --git a/migration.c b/migration.c > index f20315f..f44b857 100644 > --- a/migration.c > +++ b/migration.c > @@ -180,9 +180,9 @@ static void migrate_put_status(QDict *qdict, const > char *name, > { > QObject *obj; > > - obj = qobject_from_jsonf("{ 'transferred': %" PRId64 ", " > - "'remaining': %" PRId64 ", " > - "'total': %" PRId64 " }", trans, rem, total); > + obj = qobject_from_jsonf("{ 'transferred': %lld, " > + "'remaining': %lld, " > + "'total': %lld }", trans, rem, total); > assert(obj != NULL); > > qdict_put_obj(qdict, name, obj); > diff --git a/monitor.c b/monitor.c > index a86454b..1738d2a 100644 > --- a/monitor.c > +++ b/monitor.c > @@ -342,8 +342,8 @@ static void timestamp_put(QDict *qdict) > if (err < 0) > return; > > - obj = qobject_from_jsonf("{ 'seconds': %" PRId64 ", " > - "'microseconds': %" PRId64 " }", > + obj = qobject_from_jsonf("{ 'seconds': %lld, " > + "'microseconds': %lld }", > (int64_t) tv.tv_sec, (int64_t) tv.tv_usec); > assert(obj != NULL); > > -- > 1.6.5.1.1367.gcd48 > > -- > SUN OF A BEACH > > >
On Mon, 8 Feb 2010 15:42:30 +0800 Roy Tam <roytam@gmail.com> wrote: > 2010/2/8 TeLeMan <geleman@gmail.com>: > > The json parser does not support "%I64d", so we have to use "%lld" > > instead of "%I64d". > > > > We use PRId64 with json in more places besides migration.c and > monitor.c, adding %I64d support in json lexer/parser is a better > choice IMO. Yes, Anthony didn't merge patches posted to the list yet, I hope he will merge yours.
diff --git a/migration.c b/migration.c index f20315f..f44b857 100644 --- a/migration.c +++ b/migration.c @@ -180,9 +180,9 @@ static void migrate_put_status(QDict *qdict, const char *name, { QObject *obj; - obj = qobject_from_jsonf("{ 'transferred': %" PRId64 ", " - "'remaining': %" PRId64 ", " - "'total': %" PRId64 " }", trans, rem, total); + obj = qobject_from_jsonf("{ 'transferred': %lld, " + "'remaining': %lld, " + "'total': %lld }", trans, rem, total); assert(obj != NULL); qdict_put_obj(qdict, name, obj); diff --git a/monitor.c b/monitor.c index a86454b..1738d2a 100644 --- a/monitor.c +++ b/monitor.c @@ -342,8 +342,8 @@ static void timestamp_put(QDict *qdict) if (err < 0) return; - obj = qobject_from_jsonf("{ 'seconds': %" PRId64 ", " - "'microseconds': %" PRId64 " }", + obj = qobject_from_jsonf("{ 'seconds': %lld, " + "'microseconds': %lld }", (int64_t) tv.tv_sec, (int64_t) tv.tv_usec); assert(obj != NULL);
The json parser does not support "%I64d", so we have to use "%lld" instead of "%I64d". Signed-off-by: TeLeMan <geleman@gmail.com> --- migration.c | 6 +++--- monitor.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-)