From b9cce184a2513046d5f86ed2a0985bf8e4a5f960 Mon Sep 17 00:00:00 2001
From: Andre Leiradella <andre@leiradella.com>
Date: Sat, 3 Sep 2016 23:29:07 +0100
Subject: [PATCH] Use PRIXPTR to print pointers, removed unneeded field from
 the /info service

---
 httpserver/httpserver.c | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/httpserver/httpserver.c b/httpserver/httpserver.c
index b14acaee27..473d4c8e53 100644
--- a/httpserver/httpserver.c
+++ b/httpserver/httpserver.c
@@ -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 ","