Use PRIXPTR to print pointers, removed unneeded field from the /info service

This commit is contained in:
Andre Leiradella 2016-09-03 23:29:07 +01:00
parent 48240ebe01
commit b9cce184a2
1 changed files with 7 additions and 6 deletions

View File

@ -11,6 +11,7 @@
#include <string.h>
#include <stdarg.h>
#include <inttypes.h>
#define BASIC_INFO "info"
#define MEMORY_MAP "memoryMap"
@ -227,10 +228,10 @@ static int httpserver_handle_basic_info(struct mg_connection* conn, void* cbdata
"\"frontendSupportsAchievements\":false,"
"\"coreSupportsAchievements\":null,"
#endif
"\"saveRam\":{\"pointer\":\"%p\",\"size\":" STRING_REP_UINT64 "},"
"\"rtcRam\":{\"pointer\":\"%p\",\"size\":" STRING_REP_UINT64 "},"
"\"systemRam\":{\"pointer\":\"%p\",\"size\":" STRING_REP_UINT64 "},"
"\"videoRam\":{\"pointer\":\"%p\",\"size\":" STRING_REP_UINT64 "},",
"\"saveRam\":{\"pointer\":\"" PRIXPTR "\",\"size\":" STRING_REP_UINT64 "},"
"\"rtcRam\":{\"pointer\":\"" PRIXPTR "\",\"size\":" STRING_REP_UINT64 "},"
"\"systemRam\":{\"pointer\":\"" PRIXPTR "\",\"size\":" STRING_REP_UINT64 "},"
"\"videoRam\":{\"pointer\":\"" PRIXPTR "\",\"size\":" STRING_REP_UINT64 "},",
core_path,
api.version,
system->info.library_name,
@ -326,7 +327,7 @@ static int httpserver_handle_basic_info(struct mg_connection* conn, void* cbdata
for (q = 0; q < system->ports.data[p].num_types; q++, ctrl++)
{
mg_printf(conn, "%s{\"index\":%u,\"id\":%u,\"description\":\"%s\"}", comma, p, ctrl->id, ctrl->desc);
mg_printf(conn, "%s{\"id\":%u,\"description\":\"%s\"}", comma, ctrl->id, ctrl->desc);
comma = ",";
}
}
@ -415,7 +416,7 @@ static int httpserver_handle_get_mmaps(struct mg_connection* conn, void* cbdata)
"%s{"
"\"id\":%u,"
"\"flags\":" STRING_REP_UINT64 ","
"\"ptr\":\"%p\","
"\"ptr\":\"" PRIXPTR "\","
"\"offset\":" STRING_REP_UINT64 ","
"\"start\":" STRING_REP_UINT64 ","
"\"select\":" STRING_REP_UINT64 ","