dont need length variables everywhere (i think)

[matrix_esp_thesis] / src / matrix.c

diff --git a/src/matrix.c b/src/matrix.c
index 90132af5f8a9b81c8a3dc755b6d5b1a12c7d63cd..5759ba24334a3d1ee8aca71e927e3cef50f248ad 100644 (file)
--- a/src/matrix.c
+++ b/src/matrix.c
@@ -1,5 +1,6 @@
 #include "matrix.h"\r
 \r
+#include <stdio.h>\r
 #include <mjson.h>\r
 \r
 \r
@@ -11,14 +12,13 @@
 bool\r
 MatrixClientInit(\r
     MatrixClient * client,\r
-    char * server, int serverLen\r
-) {\r
+    const char * server)\r
+{\r
     strcpy_s(\r
         client->server,\r
         SERVER_SIZE,\r
         server\r
     );\r
-    client->serverLen = serverLen;\r
 \r
     return true;\r
 }\r
@@ -27,54 +27,50 @@ MatrixClientInit(
 bool\r
 MatrixClientLoginPassword(\r
     MatrixClient * client,\r
-    char * username, int usernameLen,\r
-    char * password, int passwordLen,\r
-    char * displayName, int displayNameLen\r
-) {\r
+    const char * username,\r
+    const char * password,\r
+    const char * displayName)\r
+{\r
     static char requestBuffer[LOGIN_REQUEST_SIZE];\r
 \r
-    int requestLen =\r
-        mjson_snprintf(requestBuffer, LOGIN_REQUEST_SIZE,\r
-            "{"\r
-                "\"type\": \"m.login.password\","\r
-                "\"identifier\": {"\r
-                    "\"type\": \"m.id.user\","\r
-                    "\"user\": \"%.*s\""\r
-                "},"\r
-                "\"password\": \"%.*s\","\r
-                "\"initial_device_display_name\": \"%.*s\""\r
-            "}",\r
-            usernameLen, username,\r
-            passwordLen, password,\r
-            displayNameLen, displayName);\r
+    mjson_snprintf(requestBuffer, LOGIN_REQUEST_SIZE,\r
+        "{"\r
+            "\"type\": \"m.login.password\","\r
+            "\"identifier\": {"\r
+                "\"type\": \"m.id.user\","\r
+                "\"user\": \"%s\""\r
+            "},"\r
+            "\"password\": \"%s\","\r
+            "\"initial_device_display_name\": \"%s\""\r
+        "}",\r
+        username,\r
+        password,\r
+        displayName);\r
     \r
     static char responseBuffer[LOGIN_RESPONSE_SIZE];\r
-    int responseLen;\r
     bool result =\r
         MatrixHttpPost(client,\r
             LOGIN_URL,\r
-            requestBuffer, requestLen,\r
-            responseBuffer, LOGIN_RESPONSE_SIZE, &responseLen);\r
+            requestBuffer,\r
+            responseBuffer, LOGIN_RESPONSE_SIZE);\r
+    \r
+    int responseLen = strlen(responseBuffer);\r
     \r
     if (!result)\r
         return false;\r
 \r
-    client->accessTokenLen =\r
-        mjson_get_string(responseBuffer, responseLen,\r
-            "$.access_token",\r
-            client->accessTokenBuffer, ACCESS_TOKEN_SIZE);\r
-    client->deviceIdLen =\r
-        mjson_get_string(responseBuffer, responseLen,\r
-            "$.device_id",\r
-            client->deviceIdBuffer, DEVICE_ID_SIZE);\r
-    client->expireMsLen =\r
-        mjson_get_string(responseBuffer, responseLen,\r
-            "$.expires_in_ms",\r
-            client->expireMsBuffer, EXPIRE_MS_SIZE);\r
-    client->refreshTokenLen =\r
-        mjson_get_string(responseBuffer, responseLen,\r
-            "$.refresh_token",\r
-            client->refreshTokenBuffer, REFRESH_TOKEN_SIZE);\r
+    mjson_get_string(responseBuffer, responseLen,\r
+        "$.access_token",\r
+        client->accessTokenBuffer, ACCESS_TOKEN_SIZE);\r
+    mjson_get_string(responseBuffer, responseLen,\r
+        "$.device_id",\r
+        client->deviceIdBuffer, DEVICE_ID_SIZE);\r
+    mjson_get_string(responseBuffer, responseLen,\r
+        "$.expires_in_ms",\r
+        client->expireMsBuffer, EXPIRE_MS_SIZE);\r
+    mjson_get_string(responseBuffer, responseLen,\r
+        "$.refresh_token",\r
+        client->refreshTokenBuffer, REFRESH_TOKEN_SIZE);\r
 \r
     return true;\r
 }\r