From dde708692c784f0e9a0bc606acfaf8d505086718 Mon Sep 17 00:00:00 2001
From: lemoer <git@irrelefant.net>
Date: Sat, 17 Mar 2018 01:17:25 +0100
Subject: [PATCH] gluon-respondd: use %SCNu64 instead of %llu for uint64_t
---
package/gluon-respondd/src/respondd.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/package/gluon-respondd/src/respondd.c b/package/gluon-respondd/src/respondd.c
index 5c038d181..6232683b5 100644
--- a/package/gluon-respondd/src/respondd.c
+++ b/package/gluon-respondd/src/respondd.c
@@ -35,6 +35,7 @@
#include <string.h>
#include <unistd.h>
#include <time.h>
+#include <inttypes.h>
#include <sys/vfs.h>
@@ -228,7 +229,7 @@ static struct json_object * get_stat(void) {
if (!strcmp(label, "cpu")) {
unsigned long long user, nice, system, idle, iowait, irq, softirq;
- if(sscanf(line, "%*s %llu %llu %llu %llu %llu %llu %llu",
+ if(sscanf(line, "%*s %"SCNu64" %"SCNu64" %"SCNu64" %"SCNu64" %"SCNu64" %"SCNu64" %"SCNu64,
&user, &nice, &system, &idle, &iowait, &irq, &softirq) != 7)
goto invalid_stat_format;
@@ -245,25 +246,25 @@ static struct json_object * get_stat(void) {
json_object_object_add(stat, "cpu", cpu);
} else if (!strcmp(label, "ctxt")) {
unsigned long long ctxt;
- if(sscanf(line, "%*s %llu", &ctxt) != 1)
+ if(sscanf(line, "%*s %"SCNu64, &ctxt) != 1)
goto invalid_stat_format;
json_object_object_add(stat, "ctxt", json_object_new_int64(ctxt));
} else if (!strcmp(label, "intr")) {
unsigned long long total_intr;
- if(sscanf(line, "%*s %llu", &total_intr) != 1)
+ if(sscanf(line, "%*s %"SCNu64, &total_intr) != 1)
goto invalid_stat_format;
json_object_object_add(stat, "intr", json_object_new_int64(total_intr));
} else if (!strcmp(label, "softirq")) {
unsigned long long total_softirq;
- if(sscanf(line, "%*s %llu", &total_softirq) != 1)
+ if(sscanf(line, "%*s %"SCNu64, &total_softirq) != 1)
goto invalid_stat_format;
json_object_object_add(stat, "softirq", json_object_new_int64(total_softirq));
} else if (!strcmp(label, "processes")) {
unsigned long long processes;
- if(sscanf(line, "%*s %llu", &processes) != 1)
+ if(sscanf(line, "%*s %"SCNu64, &processes) != 1)
goto invalid_stat_format;
json_object_object_add(stat, "processes", json_object_new_int64(processes));
--
GitLab