Merge pull request #3497 from leiradel/master

renamed "api" to "apiVersion"
This commit is contained in:
Twinaphex 2016-09-03 22:08:51 +02:00 committed by GitHub
commit 6c222626b2

View File

@ -207,7 +207,7 @@ static int httpserver_handle_basic_info(struct mg_connection* conn, void* cbdata
"HTTP/1.1 200 OK\r\nContent-Type: application/json\r\n\r\n"
"{"
"\"corePath\":\"%s\","
"\"api\":%u,"
"\"apiVersion\":%u,"
"\"systemInfo\":"
"{"
"\"libraryName\":\"%s\","
@ -227,10 +227,10 @@ static int httpserver_handle_basic_info(struct mg_connection* conn, void* cbdata
"\"frontendSupportsAchievements\":false,"
"\"coreSupportsAchievements\":null,"
#endif
"\"saveRam\":{\"ptr\":\"%p\",\"size\":" STRING_REP_UINT64 "},"
"\"rtcRam\":{\"ptr\":\"%p\",\"size\":" STRING_REP_UINT64 "},"
"\"systemRam\":{\"ptr\":\"%p\",\"size\":" STRING_REP_UINT64 "},"
"\"videoRam\":{\"ptr\":\"%p\",\"size\":" STRING_REP_UINT64 "},",
"\"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 "},",
core_path,
api.version,
system->info.library_name,
@ -326,7 +326,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,\"desc\":\"%s\"}", comma, p, ctrl->id, ctrl->desc);
mg_printf(conn, "%s{\"index\":%u,\"id\":%u,\"description\":\"%s\"}", comma, p, ctrl->id, ctrl->desc);
comma = ",";
}
}