Skip to content

Commit 0d92586

Browse files
sbc100sbc100
authored
Cleanup struct_info.json. NFC (#17518)
Include only what we need in out JS code.
1 parent c3235b0 commit 0d92586

File tree

5 files changed

+25
-141
lines changed

5 files changed

+25
-141
lines changed

‎src/library_syscall.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,12 @@ var SyscallsLibrary = {
5353
throw e;
5454
}
5555
{{{ makeSetValue('buf', C_STRUCTS.stat.st_dev, 'stat.dev', 'i32') }}};
56-
{{{ makeSetValue('buf', C_STRUCTS.stat.__st_dev_padding, '0', 'i32') }}};
5756
{{{ makeSetValue('buf', C_STRUCTS.stat.__st_ino_truncated, 'stat.ino', 'i32') }}};
5857
{{{ makeSetValue('buf', C_STRUCTS.stat.st_mode, 'stat.mode', 'i32') }}};
5958
{{{ makeSetValue('buf', C_STRUCTS.stat.st_nlink, 'stat.nlink', 'i32') }}};
6059
{{{ makeSetValue('buf', C_STRUCTS.stat.st_uid, 'stat.uid', 'i32') }}};
6160
{{{ makeSetValue('buf', C_STRUCTS.stat.st_gid, 'stat.gid', 'i32') }}};
6261
{{{ makeSetValue('buf', C_STRUCTS.stat.st_rdev, 'stat.rdev', 'i32') }}};
63-
{{{ makeSetValue('buf', C_STRUCTS.stat.__st_rdev_padding, '0', 'i32') }}};
6462
{{{ makeSetValue('buf', C_STRUCTS.stat.st_size, 'stat.size', 'i64') }}};
6563
{{{ makeSetValue('buf', C_STRUCTS.stat.st_blksize, '4096', 'i32') }}};
6664
{{{ makeSetValue('buf', C_STRUCTS.stat.st_blocks, 'stat.blocks', 'i32') }}};

‎src/struct_info.json

Lines changed: 7 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,12 @@
2929
"structs": {
3030
"stat": [
3131
"st_dev",
32-
"__st_dev_padding",
3332
"__st_ino_truncated",
3433
"st_mode",
3534
"st_nlink",
3635
"st_uid",
3736
"st_gid",
3837
"st_rdev",
39-
"__st_rdev_padding",
4038
"st_size",
4139
"st_blksize",
4240
"st_blocks",
@@ -103,11 +101,7 @@
103101
],
104102
"structs": {
105103
"flock": [
106-
"l_type",
107-
"l_whence",
108-
"l_start",
109-
"l_len",
110-
"l_pid"
104+
"l_type"
111105
]
112106
}
113107
},
@@ -180,10 +174,6 @@
180174
"EAI_BADFLAGS"
181175
],
182176
"structs": {
183-
"sockaddr": [
184-
"sa_family",
185-
"sa_data"
186-
],
187177
"hostent": [
188178
"h_name",
189179
"h_aliases",
@@ -213,8 +203,7 @@
213203
"sin_addr": [
214204
"s_addr"
215205
]
216-
},
217-
"sin_zero"
206+
}
218207
],
219208
"iovec": [
220209
"iov_base",
@@ -223,7 +212,6 @@
223212
"sockaddr_in6": [
224213
"sin6_family",
225214
"sin6_port",
226-
"sin6_flowinfo",
227215
{
228216
"sin6_addr": [
229217
{
@@ -234,17 +222,13 @@
234222
]
235223
}
236224
]
237-
},
238-
"sin6_scope_id"
225+
}
239226
],
240227
"msghdr": [
241228
"msg_name",
242229
"msg_namelen",
243230
"msg_iov",
244-
"msg_iovlen",
245-
"msg_control",
246-
"msg_controllen",
247-
"msg_flags"
231+
"msg_iovlen"
248232
]
249233
}
250234
},
@@ -532,21 +516,10 @@
532516
"palette",
533517
"BitsPerPixel",
534518
"BytesPerPixel",
535-
"padding",
536519
"Rmask",
537520
"Gmask",
538521
"Bmask",
539-
"Amask",
540-
"Rloss",
541-
"Gloss",
542-
"Bloss",
543-
"Aloss",
544-
"Rshift",
545-
"Gshift",
546-
"Bshift",
547-
"Ashift",
548-
"refcount",
549-
"next"
522+
"Amask"
550523
]
551524
}
552525
},
@@ -560,11 +533,7 @@
560533
"h",
561534
"pitch",
562535
"pixels",
563-
"userdata",
564-
"locked",
565-
"lock_data",
566536
"clip_rect",
567-
"map",
568537
"refcount"
569538
]
570539
}
@@ -575,25 +544,16 @@
575544
"SDL_WindowEvent": [
576545
"type",
577546
"windowID",
578-
"event",
579-
"padding1",
580-
"padding2",
581-
"padding3",
582-
"data1",
583-
"data2"
547+
"event"
584548
],
585549
"SDL_KeyboardEvent": [
586550
"type",
587-
"windowID",
588551
"state",
589552
"repeat",
590-
"padding2",
591-
"padding3",
592553
"keysym"
593554
],
594555
"SDL_TextInputEvent": [
595556
"type",
596-
"windowID",
597557
"text"
598558
],
599559
"SDL_MouseMotionEvent": [
@@ -614,33 +574,25 @@
614574
"which",
615575
"button",
616576
"state",
617-
"padding1",
618-
"padding2",
619577
"x",
620578
"y"
621579
],
622580
"SDL_MouseWheelEvent": [
623581
"type",
624-
"timestamp",
625-
"windowID",
626-
"which",
627582
"x",
628583
"y"
629584
],
630585
"SDL_JoyAxisEvent": [
631586
"type",
632587
"which",
633588
"axis",
634-
"padding1",
635-
"padding2",
636589
"value"
637590
],
638591
"SDL_JoyButtonEvent": [
639592
"type",
640593
"which",
641594
"button",
642-
"state",
643-
"padding1"
595+
"state"
644596
],
645597
"SDL_TouchFingerEvent": [
646598
"type",
@@ -654,7 +606,6 @@
654606
"pressure"
655607
],
656608
"SDL_ResizeEvent": [
657-
"type",
658609
"w",
659610
"h"
660611
]
@@ -678,8 +629,6 @@
678629
"channels",
679630
"silence",
680631
"samples",
681-
"padding",
682-
"size",
683632
"callback",
684633
"userdata"
685634
]

‎src/struct_info_internal.json

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,14 @@
77
"structs": {
88
"pthread": [
99
"profilerBlock",
10-
"tsd",
1110
"stack",
12-
"stack_size",
13-
"result",
14-
"robust_list",
15-
"tid",
16-
"cancel",
17-
"canceldisable",
18-
"cancelasync",
19-
"locale"
11+
"stack_size"
2012
],
2113
"pthread_attr_t#": [
2214
"_a_transferredcanvases"
2315
],
2416
"thread_profiler_block": [
2517
"threadStatus",
26-
"currentStatusStartTime",
2718
"timeSpentInStatus",
2819
"name"
2920
]

0 commit comments

Comments
 (0)