feat: use size_t field type in mallinfo

Signed-off-by: Nolefirenque <olefirenko.egor@huawei-partners.com>

include/malloc.h

@@ -18,33 +18,23 @@ void *memalign(size_t, size_t);
 
 size_t malloc_usable_size(void *);
 
-struct mallinfo {
-  int arena;
-  int ordblks;
-  int smblks;
-  int hblks;
-  int hblkhd;
-  int usmblks;
-  int fsmblks;
-  int uordblks;
-  int fordblks;
-  int keepcost;
-};
+#define __MALLINFO_BODY \
+  size_t arena; \
+  size_t ordblks; \
+  size_t smblks; \
+  size_t hblks; \
+  size_t hblkhd; \
+  size_t usmblks; \
+  size_t fsmblks; \
+  size_t uordblks; \
+  size_t fordblks; \
+  size_t keepcost;
+
+struct mallinfo { __MALLINFO_BODY };
 
 struct mallinfo mallinfo(void);
 
-struct mallinfo2 {
-  size_t arena;
-  size_t ordblks;
-  size_t smblks;
-  size_t hblks;
-  size_t hblkhd;
-  size_t usmblks;
-  size_t fsmblks;
-  size_t uordblks;
-  size_t fordblks;
-  size_t keepcost;
-};
+struct mallinfo2 { __MALLINFO_BODY };
 
 struct mallinfo2 mallinfo2(void);
 

ndk_musl_include/malloc.h

@@ -18,31 +18,21 @@ void *memalign(size_t, size_t);
 
 size_t malloc_usable_size(void *);
 
-struct mallinfo {
-  int arena;
-  int ordblks;
-  int smblks;
-  int hblks;
-  int hblkhd;
-  int usmblks;
-  int fsmblks;
-  int uordblks;
-  int fordblks;
-  int keepcost;
-};
-
-struct mallinfo2 {
-  size_t arena;
-  size_t ordblks;
-  size_t smblks;
-  size_t hblks;
-  size_t hblkhd;
-  size_t usmblks;
-  size_t fsmblks;
-  size_t uordblks;
-  size_t fordblks;
+#define __MALLINFO_BODY \
+  size_t arena; \
+  size_t ordblks; \
+  size_t smblks; \
+  size_t hblks; \
+  size_t hblkhd; \
+  size_t usmblks; \
+  size_t fsmblks; \
+  size_t uordblks; \
+  size_t fordblks; \
   size_t keepcost;
-};
+
+struct mallinfo { __MALLINFO_BODY };
+
+struct mallinfo2 { __MALLINFO_BODY };
 
 #ifdef __cplusplus
 }

porting/linux/user/include/malloc.h

@@ -22,33 +22,23 @@ void *memalign(size_t, size_t);
 
 size_t malloc_usable_size(void *);
 
-struct mallinfo {
-    int arena;
-    int ordblks;
-    int smblks;
-    int hblks;
-    int hblkhd;
-    int usmblks;
-    int fsmblks;
-    int uordblks;
-    int fordblks;
-    int keepcost;
-};
+#define __MALLINFO_BODY \
+  size_t arena; \
+  size_t ordblks; \
+  size_t smblks; \
+  size_t hblks; \
+  size_t hblkhd; \
+  size_t usmblks; \
+  size_t fsmblks; \
+  size_t uordblks; \
+  size_t fordblks; \
+  size_t keepcost;
+
+struct mallinfo { __MALLINFO_BODY };
 
 struct mallinfo mallinfo(void);
 
-struct mallinfo2 {
-    size_t arena;
-    size_t ordblks;
-    size_t smblks;
-    size_t hblks;
-    size_t hblkhd;
-    size_t usmblks;
-    size_t fsmblks;
-    size_t uordblks;
-    size_t fordblks;
-    size_t keepcost;
-};
+struct mallinfo2 { __MALLINFO_BODY };
 
 struct mallinfo2 mallinfo2(void);
 

porting/linux/user/src/malloc/stats.c

@@ -280,9 +280,9 @@ struct mallinfo mallinfo(void)
 {
 	struct mallinfo2 mallinfo2_res = mallinfo2();
 	return (struct mallinfo) {
-		.hblks = (int) mallinfo2_res.hblks,
-		.hblkhd = (int) mallinfo2_res.hblkhd,
-		.uordblks = (int) mallinfo2_res.uordblks,
-		.fordblks = (int) mallinfo2_res.fordblks,
+		.hblks = mallinfo2_res.hblks,
+		.hblkhd = mallinfo2_res.hblkhd,
+		.uordblks = mallinfo2_res.uordblks,
+		.fordblks = mallinfo2_res.fordblks,
 	};
 }