Skip to content

Commit 39bfc3e

Browse files
committed
Cleanup deps_info.json. NFC.
- SDL_getenv: was removed from JS in #12319 - getenv: was removed from JS in #11885 - getlogin: depends on getenv so used to require JS? - __ctype_b_loc: implemented in pure C - __ctype_tolower_loc: implemented in pure C - __ctype_toupper_loc: implemented in pure C - calloc/realloc: implemented in pure C - tmpnam: can't tell why this was ever in here - freelocale/freeaddrinfo: implemented in pure C - newlocale: implemented in pure C - realpath: implemented in pure C - strerr: implemented in pure C - ttyname: implemented in pure C For these two symbols I can see no evidence as to why they were ever added here. - freopen - syslog
1 parent 1765ab5 commit 39bfc3e

File tree

3 files changed

+4
-21
lines changed

3 files changed

+4
-21
lines changed

src/library.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -703,11 +703,6 @@ LibraryManager.library = {
703703
#endif
704704
},
705705

706-
// This object can be modified by the user during startup, which affects
707-
// the initial values of the environment accessible by getenv. (This works
708-
// in both fastcomp and upstream).
709-
$ENV: {},
710-
711706
getloadavg: function(loadavg, nelem) {
712707
// int getloadavg(double loadavg[], int nelem);
713708
// http://linux.die.net/man/3/getloadavg

src/library_wasi.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ var WasiLibrary = {
1111
_exit(code);
1212
},
1313

14+
// This object can be modified by the user during startup, which affects
15+
// the initial values of the environment accessible by getEnvStrings/getenv.
16+
$ENV: {},
17+
1418
$getEnvStrings__deps: ['$ENV', '$getExecutableName'],
1519
$getEnvStrings: function() {
1620
if (!getEnvStrings.strings) {

tools/deps_info.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,7 @@
5858
'SDL_OpenAudio': ['malloc', 'free'],
5959
'SDL_PushEvent': ['malloc', 'free'],
6060
'SDL_free': ['free'],
61-
'SDL_getenv': ['malloc', 'free'],
6261
'SDL_malloc': ['malloc', 'free'],
63-
'__ctype_b_loc': ['malloc', 'free'],
64-
'__ctype_tolower_loc': ['malloc', 'free'],
65-
'__ctype_toupper_loc': ['malloc', 'free'],
6662
'__cxa_allocate_exception': ['malloc', 'free', 'setThrew'],
6763
'__cxa_begin_catch': ['_ZSt18uncaught_exceptionv', 'setThrew'],
6864
'__cxa_end_catch': ['free'],
@@ -92,7 +88,6 @@
9288
'alcGetProcAddress': ['emscripten_GetAlcProcAddress'],
9389
'alcGetString': ['malloc', 'free'],
9490
'bind': ['htonl', 'htons', 'ntohs'],
95-
'calloc': ['malloc', 'free'],
9691
'connect': ['htonl', 'htons', 'ntohs'],
9792
'ctime': ['_get_tzname', '_get_daylight', '_get_timezone', 'malloc', 'free'],
9893
'ctime_r': ['_get_tzname', '_get_daylight', '_get_timezone', 'malloc', 'free'],
@@ -176,14 +171,10 @@
176171
'emscripten_wget_data': ['malloc', 'free'],
177172
'formatString': ['strlen'],
178173
'freeaddrinfo': ['free'],
179-
'freelocale': ['free'],
180-
'freopen': ['free'],
181174
'gai_strerror': ['malloc', 'free'],
182175
'getaddrinfo': ['malloc', 'free', 'htonl', 'htons', 'ntohs'],
183-
'getenv': ['malloc', 'free'],
184176
'gethostbyname': ['malloc', 'free', 'htons', 'ntohs', 'memcpy'],
185177
'gethostbyname_r': ['malloc', 'free', 'htons', 'ntohs', 'memcpy'],
186-
'getlogin': ['malloc', 'free'],
187178
'getnameinfo': ['htons', 'ntohs'],
188179
'getpeername': ['htons', 'ntohs'],
189180
'getrusage': ['memset'],
@@ -204,12 +195,9 @@
204195
'mktime': ['_get_tzname', '_get_daylight', '_get_timezone', 'malloc', 'free'],
205196
'mmap': ['memalign', 'memset', 'malloc', 'free'],
206197
'munmap': ['memalign', 'memset', 'malloc', 'free'],
207-
'newlocale': ['malloc', 'free'],
208198
'nl_langinfo': ['malloc', 'free'],
209199
'pthread_create': ['malloc', 'free', 'emscripten_main_thread_process_queued_calls'],
210200
'readdir': ['malloc', 'free'],
211-
'realloc': ['malloc', 'free'],
212-
'realpath': ['malloc', 'free'],
213201
'recv': ['htons', 'ntohs'],
214202
'send': ['htons', 'ntohs'],
215203
'setjmp': ['setThrew', 'realloc', 'testSetjmp', 'saveSetjmp'],
@@ -218,13 +206,9 @@
218206
'sleep': ['usleep'],
219207
'socket': ['htonl', 'htons', 'ntohs'],
220208
'socketpair': ['htons', 'ntohs'],
221-
'strerror': ['malloc', 'free'],
222209
'stringToNewUTF8': ['malloc', 'free'],
223-
'syslog': ['malloc', 'htons', 'ntohs'],
224210
'timegm': ['_get_tzname', '_get_daylight', '_get_timezone', 'malloc', 'free'],
225211
'times': ['memset'],
226-
'tmpnam': ['malloc', 'free'],
227-
'ttyname': ['malloc', 'free'],
228212
'tzset': ['_get_tzname', '_get_daylight', '_get_timezone', 'malloc', 'free'],
229213
'uuid_clear': ['memset'],
230214
'uuid_compare': ['memcmp', 'memcpy', 'memset'],

0 commit comments

Comments
 (0)