aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNelson Billing <nbilling@google.com>2019-03-18 13:33:52 -0700
committerNelson Billing <nbilling@google.com>2019-03-18 23:08:12 +0000
commita86aedb515c3b2bd778b342402f09bc6009e8d7b (patch)
tree4e79eaf233f2f9ee2f750236368b873a66c8607f /src
parentlinux_core_dumper: handle missing SIGSYS support (diff)
downloadbreakpad-a86aedb515c3b2bd778b342402f09bc6009e8d7b.tar.xz
Fix dump_syms unit tests on Windows.
- Baselines appeared to be stale. dump_syms now prints FUNC entries with the full function signature, whereas the baselines only contained the function name. The current state of the symbol file docs (https://chromium.googlesource.com/breakpad/breakpad/+/refs/heads/master/docs/symbol_files.md) seem to agree with the new FUNC entries rather than the old ones. Example of a name given in current docs: "nsQueryInterfaceWithError::operator()(nsID const&, void**) const". Change-Id: I9e01354cd82b7184b7cba31d132603e949a657ac Reviewed-on: https://chromium-review.googlesource.com/c/breakpad/breakpad/+/1529133 Reviewed-by: Ivan Penkov <ivanpe@chromium.org>
Diffstat (limited to 'src')
-rw-r--r--src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym32
-rw-r--r--src/tools/windows/dump_syms/testdata/dump_syms_regtest64.sym78
-rw-r--r--src/tools/windows/dump_syms/testdata/omap_reorder_bbs.sym416
-rw-r--r--src/tools/windows/dump_syms/testdata/omap_reorder_funcs.sym32
-rw-r--r--src/tools/windows/dump_syms/testdata/omap_stretched.sym44
-rw-r--r--src/tools/windows/dump_syms/testdata/omap_stretched_filled.sym32
6 files changed, 317 insertions, 317 deletions
diff --git a/src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym b/src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym
index 66a22192..696155dd 100644
--- a/src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym
+++ b/src/tools/windows/dump_syms/testdata/dump_syms_regtest.sym
@@ -290,7 +290,7 @@ FUNC 1000 54 0 main
102f f 62 1
103e 12 64 1
1050 4 65 1
-FUNC 1060 a 0 google_breakpad::i
+FUNC 1060 a 0 static int google_breakpad::i()
1060 3 51 1
1063 5 52 1
1068 2 53 1
@@ -316,14 +316,14 @@ FUNC 117d b 0 operator delete(void *)
117d 5 20 2875
1182 1 24 2875
1183 5 23 2875
-FUNC 1188 29 0 fast_error_exit
+FUNC 1188 29 0 static void fast_error_exit(int)
1188 5 326 4250
118d 9 335 4250
1196 5 337 4250
119b 8 339 4250
11a3 c 340 4250
11af 2 341 4250
-FUNC 11b1 161 0 __tmainCRTStartup
+FUNC 11b1 161 0 static int __tmainCRTStartup()
11b1 c 196 4250
11bd a 214 4250
11c7 b 216 4250
@@ -505,7 +505,7 @@ FUNC 154e 97 0 _cinit
15d5 c 303 4186
15e1 2 307 4186
15e3 2 308 4186
-FUNC 15e5 140 0 doexit
+FUNC 15e5 140 0 static void doexit(int, int, int)
15e5 c 489 4186
15f1 8 507 4186
15f9 4 508 4186
@@ -675,7 +675,7 @@ FUNC 1ae5 dc 0 _setenvp
1ba8 7 130 3838
1baf 5 131 3838
1bb4 d 133 3838
-FUNC 1bc1 19a 0 parse_cmdline
+FUNC 1bc1 19a 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
1bc1 6 221 3891
1bc7 9 229 3891
1bd0 2 232 3891
@@ -1194,7 +1194,7 @@ FUNC 2c8b 94 0 malloc
2d1a 3 113 504
2d1d 2 122 504
FUNC 2d20 90 0 _local_unwind4
-FUNC 2db0 46 0 _unwind_handler4
+FUNC 2db0 46 0 static void _unwind_handler4()
FUNC 2df6 1c 4 _seh_longjmp_unwind4
FUNC 2e12 17 0 _EH4_CallFilterFunc
FUNC 2e29 19 0 _EH4_TransferToHandler
@@ -1242,7 +1242,7 @@ FUNC 2f11 1e 0 _initp_misc_winsig
2f23 5 60 2311
2f28 5 61 2311
2f2d 2 62 2311
-FUNC 2f2f 37 0 siglookup
+FUNC 2f2f 37 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
2f2f 5 629 2311
2f34 a 630 2311
2f3e 14 639 2311
@@ -1328,7 +1328,7 @@ FUNC 3143 28 0 _callnewh
3165 2 139 2820
3167 2 136 2820
3169 2 139 2820
-FUNC 316b b6 0 _onexit_nolock
+FUNC 316b b6 0 static * _onexit_nolock( *)
316b 8 100 1969
3173 f 103 1969
3182 f 104 1969
@@ -1535,7 +1535,7 @@ FUNC 3827 4e 0 _realloc_crt
386a 5 79 333
386f 4 82 333
3873 2 83 333
-FUNC 3875 2f 0 CPtoLCID
+FUNC 3875 2f 0 static int CPtoLCID(int)
3875 0 329 3326
3875 14 330 3326
3889 2 345 3326
@@ -1548,7 +1548,7 @@ FUNC 3875 2f 0 CPtoLCID
389d 1 346 3326
389e 5 333 3326
38a3 1 346 3326
-FUNC 38a4 64 0 setSBCS
+FUNC 38a4 64 0 static void setSBCS(struct threadmbcinfostruct *)
38a4 6 363 3326
38aa 11 368 3326
38bb 1b 379 3326
@@ -1557,7 +1557,7 @@ FUNC 38a4 64 0 setSBCS
38f1 b 384 3326
38fc 9 385 3326
3905 3 386 3326
-FUNC 3908 190 0 setSBUpLow
+FUNC 3908 190 0 static void setSBUpLow(struct threadmbcinfostruct *)
3908 17 402 3326
391f 10 412 3326
392f f 415 3326
@@ -1623,7 +1623,7 @@ FUNC 3b3c 87 0 _LocaleUpdate::_LocaleUpdate(localeinfo_struct *)
3bb0 2 255 111
3bb2 a 257 111
3bbc 7 259 111
-FUNC 3bc3 7c 0 getSystemCP
+FUNC 3bc3 7c 0 static int getSystemCP(int)
3bc3 9 282 3326
3bcc b 284 3326
3bd7 6 285 3326
@@ -1734,7 +1734,7 @@ FUNC 3fc2 1e 0 __initmbctable
3fd3 a 853 3326
3fdd 2 858 3326
3fdf 1 859 3326
-FUNC 3fe0 53 0 x_ismbbtype_l
+FUNC 3fe0 53 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
3fe0 8 213 3271
3fe8 b 214 3271
3ff3 4 219 3271
@@ -1953,7 +1953,7 @@ FUNC 4410 95 0 _aulldvrm
44a1 1 180 2806
44a2 3 182 2806
FUNC 44b0 20 0 _global_unwind2
-FUNC 44d0 45 0 __unwind_handler
+FUNC 44d0 45 0 static void __unwind_handler()
FUNC 4515 84 0 _local_unwind2
FUNC 4599 23 0 _abnormal_termination
FUNC 45bc 9 0 _NLG_Notify1
@@ -2301,7 +2301,7 @@ FUNC 4b65 ad 0 realloc
4bf6 2 112 618
4bf8 16 103 618
4c0e 4 105 618
-FUNC 4c12 1e7 0 __crtLCMapStringA_stat
+FUNC 4c12 1e7 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
4c12 12 96 3447
4c24 c 101 3447
4c30 17 102 3447
@@ -2338,7 +2338,7 @@ FUNC 4df9 46 0 __crtLCMapStringA
4e01 b 259 3447
4e0c 31 271 3447
4e3d 2 272 3447
-FUNC 4e3f e7 0 __crtGetStringTypeA_stat
+FUNC 4e3f e7 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
4e3f 12 63 3507
4e51 7 67 3507
4e58 5 83 3507
diff --git a/src/tools/windows/dump_syms/testdata/dump_syms_regtest64.sym b/src/tools/windows/dump_syms/testdata/dump_syms_regtest64.sym
index 39815245..eb839165 100644
--- a/src/tools/windows/dump_syms/testdata/dump_syms_regtest64.sym
+++ b/src/tools/windows/dump_syms/testdata/dump_syms_regtest64.sym
@@ -322,7 +322,7 @@ FILE 10842 f:\dd\vctools\crt\crtw32\eh\typinfo.cpp
FILE 10933 f:\dd\vctools\crt\crtw32\eh\hooks.cpp
FILE 11032 f:\dd\vctools\crt\crtw32\rtc\initsect.cpp
FILE 11055 f:\dd\vctools\crt\crtw32\h\rtcpriv.h
-FUNC 1000 6 0 google_breakpad::i
+FUNC 1000 6 0 static int google_breakpad::i()
1000 0 51 1
1000 5 52 1
1005 1 53 1
@@ -352,7 +352,7 @@ FUNC 1178 5 0 operator delete(void *)
1178 0 20 6742
1178 5 23 6742
FUNC 1180 39 0 type_info::`scalar deleting destructor'(unsigned int)
-FUNC 11bc 180 0 __tmainCRTStartup
+FUNC 11bc 180 0 static int __tmainCRTStartup()
11bc a 172 9116
11c6 c 188 9116
11d2 4e 196 9116
@@ -384,7 +384,7 @@ FUNC 11bc 180 0 __tmainCRTStartup
1329 6 278 9116
132f 2 282 9116
1331 b 283 9116
-FUNC 133c 2c 0 fast_error_exit
+FUNC 133c 2c 0 static void fast_error_exit(int)
133c 6 305 9116
1342 b 315 9116
134d 5 317 9116
@@ -652,7 +652,7 @@ FUNC 1b4c 4b 0 init_pointers
1b85 8 889 9790
1b8d 5 900 9790
1b92 5 893 9790
-FUNC 1b98 60 0 _initterm
+FUNC 1b98 60 0 static void _initterm( * *, * *)
1b98 30 941 9790
1bc8 5 948 9790
1bcd 8 953 9790
@@ -673,7 +673,7 @@ FUNC 1c34 a 0 lockexit
FUNC 1c40 a 0 unlockexit
1c40 0 851 9790
1c40 a 852 9790
-FUNC 1c4c 195 0 doexit
+FUNC 1c4c 195 0 static void doexit(int, int, int)
1c4c 24 552 9790
1c70 b 568 9790
1c7b d 571 9790
@@ -799,7 +799,7 @@ FUNC 2140 f3 0 setargv
221c 4 177 9411
2220 3 138 9411
2223 10 178 9411
-FUNC 2234 1c7 0 parse_cmdline
+FUNC 2234 1c7 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
2234 1d 223 9411
2251 15 230 9411
2266 7 231 9411
@@ -1524,7 +1524,7 @@ FUNC 3ef8 a8 0 _LocaleUpdate::_LocaleUpdate(localeinfo_struct *)
3f8e 2 260 208
3f90 7 262 208
3f97 9 264 208
-FUNC 3fa0 7d 0 getSystemCP
+FUNC 3fa0 7d 0 static int getSystemCP(int)
3fa0 8 295 8253
3fa8 c 297 8253
3fb4 7 298 8253
@@ -1538,7 +1538,7 @@ FUNC 3fa0 7d 0 getSystemCP
3ff0 12 320 8253
4002 15 323 8253
4017 6 324 8253
-FUNC 4020 8e 0 setSBCS
+FUNC 4020 8e 0 static void setSBCS(struct threadmbcinfostruct *)
4020 14 374 8253
4034 7 378 8253
403b 12 379 8253
@@ -1550,7 +1550,7 @@ FUNC 4020 8e 0 setSBCS
4080 c 395 8253
408c d 396 8253
4099 15 397 8253
-FUNC 40b0 1e1 0 setSBUpLow
+FUNC 40b0 1e1 0 static void setSBUpLow(struct threadmbcinfostruct *)
40b0 2e 413 8253
40de e 423 8253
40ec 14 426 8253
@@ -1872,7 +1872,7 @@ FUNC 4f28 1d 0 unlock_file2
4f2d 5 342 5182
4f32 8 343 5182
4f3a b 351 5182
-FUNC 4f48 79 0 x_ismbbtype_l
+FUNC 4f48 79 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
4f48 11 223 8159
4f59 13 224 8159
4f6c 45 232 8159
@@ -2332,7 +2332,7 @@ FUNC 5a6c 3fa 0 _free_lc_time
5e48 c 331 3520
5e54 c 333 3520
5e60 6 336 3520
-FUNC 5e68 2ec 0 __crtLCMapStringA_stat
+FUNC 5e68 2ec 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, const wchar_t *, unsigned long, const char *, int, char *, int, int, int)
5e68 2d 96 8449
5e95 13 101 8449
5ea8 21 102 8449
@@ -2368,7 +2368,7 @@ FUNC 6154 96 0 _crtLCMapStringA
6166 13 259 8449
6179 5f 271 8449
61d8 12 272 8449
-FUNC 61ec 176 0 __crtGetStringTypeA_stat
+FUNC 61ec 176 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int)
61ec 2d 60 8545
6219 14 80 8545
622d 7 81 8545
@@ -2841,7 +2841,7 @@ FUNC 6c1c 79 0 flush
FUNC 6c98 a 0 flushall
6c98 0 193 5660
6c98 a 194 5660
-FUNC 6ca4 e6 0 flsall
+FUNC 6ca4 e6 0 static int flsall(int)
6ca4 1c 228 5660
6cc0 2 230 5660
6cc2 2 231 5660
@@ -3645,7 +3645,7 @@ FUNC 9b08 3b0 0 cftoa_l
9e7e 4 626 9904
9e82 16 628 9904
9e98 20 629 9904
-FUNC 9eb8 1f9 0 _cftoe2_l
+FUNC 9eb8 1f9 0 static int _cftoe2_l(char *, unsigned __int64, int, int, struct _strflt *, char, struct localeinfo_struct *)
9eb8 20 242 9904
9ed8 1a 246 9904
9ef2 5 249 9904
@@ -3691,7 +3691,7 @@ a15b 3 376 9904
a15e 2 377 9904
a160 32 380 9904
a192 19 383 9904
-FUNC a1ac 161 0 _cftof2_l
+FUNC a1ac 161 0 static int _cftof2_l(char *, unsigned __int64, int, struct _strflt *, char, struct localeinfo_struct *)
a1ac 19 638 9904
a1c5 7 640 9904
a1cc 19 641 9904
@@ -4097,76 +4097,76 @@ b952 15 130 9988
b967 15 136 9988
PUBLIC b97c 0 RtlUnwindEx
PUBLIC b982 0 IsProcessorFeaturePresent
-FUNC b990 1e 0 __tmainCRTStartup$filt$0
+FUNC b990 1e 0 static __tmainCRTStartup$filt$0()
b990 1e 267 9116
-FUNC b9ae 19 0 `type_info::_Type_info_dtor'::`1'::fin$0
+FUNC b9ae 19 0 static `type_info::_Type_info_dtor'::`1'::fin$0()
b9ae 9 72 10741
b9b7 10 73 10741
-FUNC b9c7 19 0 _freefls$fin$1
+FUNC b9c7 19 0 static _freefls$fin$1()
b9c7 9 413 9313
b9d0 10 414 9313
-FUNC b9e0 19 0 _freefls$fin$0
+FUNC b9e0 19 0 static _freefls$fin$0()
b9e0 9 429 9313
b9e9 10 430 9313
-FUNC b9f9 19 0 _initptd$fin$1
+FUNC b9f9 19 0 static _initptd$fin$1()
b9f9 9 226 9313
ba02 10 228 9313
-FUNC ba12 19 0 _initptd$fin$0
+FUNC ba12 19 0 static _initptd$fin$0()
ba12 9 247 9313
ba1b 10 248 9313
-FUNC ba2b 24 0 doexit$fin$0
+FUNC ba2b 24 0 static doexit$fin$0()
ba2b 9 665 9790
ba34 9 666 9790
ba3d 12 667 9790
-FUNC ba4f 1b 0 _ioinit$fin$0
+FUNC ba4f 1b 0 static _ioinit$fin$0()
ba4f 9 325 1584
ba58 12 326 1584
-FUNC ba6a 1d 0 _mtinitlocknum$fin$0
+FUNC ba6a 1d 0 static _mtinitlocknum$fin$0()
ba6a 9 292 9509
ba73 14 293 9509
-FUNC ba87 19 0 __updatetlocinfo$fin$0
+FUNC ba87 19 0 static __updatetlocinfo$fin$0()
ba87 9 293 3702
ba90 10 295 3702
-FUNC baa0 19 0 __updatetmbcinfo$fin$0
+FUNC baa0 19 0 static __updatetmbcinfo$fin$0()
baa0 9 538 8253
baa9 10 540 8253
-FUNC bab9 19 0 _setmbcp$fin$0
+FUNC bab9 19 0 static _setmbcp$fin$0()
bab9 9 659 8253
bac2 10 661 8253
-FUNC bae0 20 0 _IsNonwritableInCurrentImage$filt$0
+FUNC bae0 20 0 static _IsNonwritableInCurrentImage$filt$0()
bae0 20 181 3978
-FUNC bb00 14 0 _onexit$fin$0
+FUNC bb00 14 0 static _onexit$fin$0()
bb00 e 89 3795
bb0e 6 90 3795
-FUNC bb14 1e 0 raise$fin$0
+FUNC bb14 1e 0 static raise$fin$0()
bb14 9 574 4150
bb1d 6 575 4150
bb23 f 576 4150
-FUNC bb32 28 0 flsall$fin$0
+FUNC bb32 28 0 static flsall$fin$0()
bb32 9 276 5660
bb3b 1f 277 5660
-FUNC bb5a 19 0 flsall$fin$1
+FUNC bb5a 19 0 static flsall$fin$1()
bb5a 9 282 5660
bb63 10 283 5660
-FUNC bb73 19 0 _fcloseall$fin$0
+FUNC bb73 19 0 static _fcloseall$fin$0()
bb73 9 69 5472
bb7c 10 70 5472
-FUNC bb8c 19 0 _locterm$fin$0
+FUNC bb8c 19 0 static _locterm$fin$0()
bb8c 9 193 4530
bb95 10 195 4530
-FUNC bba5 17 0 _commit$fin$0
+FUNC bba5 17 0 static _commit$fin$0()
bba5 9 72 1490
bbae e 73 1490
-FUNC bbbc 17 0 _write$fin$0
+FUNC bbbc 17 0 static _write$fin$0()
bbbc 9 81 1964
bbc5 e 82 1964
-FUNC bbd3 18 0 fclose$fin$0
+FUNC bbd3 18 0 static fclose$fin$0()
bbd3 9 58 5556
bbdc f 59 5556
-FUNC bbeb 19 0 __lock_fhandle$fin$0
+FUNC bbeb 19 0 static __lock_fhandle$fin$0()
bbeb 9 451 1865
bbf4 10 452 1865
-FUNC bc04 17 0 _close$fin$0
+FUNC bc04 17 0 static _close$fin$0()
bc04 9 60 1396
bc0d e 61 1396
STACK CFI INIT 1010 6a .cfa: $rsp .ra: .cfa 8 - ^
diff --git a/src/tools/windows/dump_syms/testdata/omap_reorder_bbs.sym b/src/tools/windows/dump_syms/testdata/omap_reorder_bbs.sym
index fe769e85..2a7c0896 100644
--- a/src/tools/windows/dump_syms/testdata/omap_reorder_bbs.sym
+++ b/src/tools/windows/dump_syms/testdata/omap_reorder_bbs.sym
@@ -290,7 +290,7 @@ FUNC 2cec 54 0 main
2d1b f 62 1
2d2a 12 64 1
2d3c 4 65 1
-FUNC 4b70 a 0 google_breakpad::i
+FUNC 4b70 a 0 static int google_breakpad::i()
4b70 3 51 1
4b73 5 52 1
4b78 2 53 1
@@ -320,10 +320,10 @@ FUNC 12a0 b 0 operator delete(void *)
12a0 5 20 2875
12a5 1 24 2875
12a6 5 23 2875
-FUNC 198c 4 0 fast_error_exit
-FUNC 1ff0 18 0 fast_error_exit
-FUNC 455c 12 0 fast_error_exit
-FUNC 4d0c 5 0 fast_error_exit
+FUNC 198c 4 0 static void fast_error_exit(int)
+FUNC 1ff0 18 0 static void fast_error_exit(int)
+FUNC 455c 12 0 static void fast_error_exit(int)
+FUNC 4d0c 5 0 static void fast_error_exit(int)
1ff0 5 326 4250
1ff5 13 335 4250
4d0c 5 337 4250
@@ -331,7 +331,7 @@ FUNC 4d0c 5 0 fast_error_exit
198c 2 340 4250
4564 a 340 4250
198e 2 341 4250
-FUNC 38be 161 0 __tmainCRTStartup
+FUNC 38be 161 0 static int __tmainCRTStartup()
38be c 196 4250
38ca a 214 4250
38d4 b 216 4250
@@ -556,7 +556,7 @@ FUNC 6f60 2 0 _cinit
1d44 c 303 4186
4bf8 2 307 4186
6f60 2 308 4186
-FUNC 35a7 140 0 doexit
+FUNC 35a7 140 0 static void doexit(int, int, int)
35a7 c 489 4186
35b3 8 507 4186
35bb 4 508 4186
@@ -809,61 +809,61 @@ FUNC 4139 dc 0 _setenvp
41fc 7 130 3838
4203 5 131 3838
4208 d 133 3838
-FUNC 1018 8 0 parse_cmdline
-FUNC 19b4 e 0 parse_cmdline
-FUNC 19f4 2 0 parse_cmdline
-FUNC 1dd0 14 0 parse_cmdline
-FUNC 1fac 28 0 parse_cmdline
-FUNC 2058 f 0 parse_cmdline
-FUNC 209c 9 0 parse_cmdline
-FUNC 2364 1a 0 parse_cmdline
-FUNC 253c 4 0 parse_cmdline
-FUNC 2598 9 0 parse_cmdline
-FUNC 25cc 10 0 parse_cmdline
-FUNC 2718 b 0 parse_cmdline
-FUNC 2730 e 0 parse_cmdline
-FUNC 28a8 a 0 parse_cmdline
-FUNC 28fc 2 0 parse_cmdline
-FUNC 290c 14 0 parse_cmdline
-FUNC 2b34 f 0 parse_cmdline
-FUNC 2bfc 10 0 parse_cmdline
-FUNC 2d88 7 0 parse_cmdline
-FUNC 3730 d 0 parse_cmdline
-FUNC 377c 2 0 parse_cmdline
-FUNC 37b0 10 0 parse_cmdline
-FUNC 3c38 24 0 parse_cmdline
-FUNC 3c84 10 0 parse_cmdline
-FUNC 3db8 1b 0 parse_cmdline
-FUNC 3e90 e 0 parse_cmdline
-FUNC 3efc 13 0 parse_cmdline
-FUNC 4110 12 0 parse_cmdline
-FUNC 42dc f 0 parse_cmdline
-FUNC 42f0 10 0 parse_cmdline
-FUNC 4518 6 0 parse_cmdline
-FUNC 4610 7 0 parse_cmdline
-FUNC 4684 11 0 parse_cmdline
-FUNC 46f8 13 0 parse_cmdline
-FUNC 4848 a 0 parse_cmdline
-FUNC 4994 f 0 parse_cmdline
-FUNC 49bc e 0 parse_cmdline
-FUNC 4aac 1 0 parse_cmdline
-FUNC 4cb8 f 0 parse_cmdline
-FUNC 4ed8 24 0 parse_cmdline
-FUNC 4f10 3 0 parse_cmdline
-FUNC 4f30 e 0 parse_cmdline
-FUNC 501c 10 0 parse_cmdline
-FUNC 5518 3 0 parse_cmdline
-FUNC 569c 3 0 parse_cmdline
-FUNC 57bc 12 0 parse_cmdline
-FUNC 5a50 10 0 parse_cmdline
-FUNC 5cc0 14 0 parse_cmdline
-FUNC 5e84 f 0 parse_cmdline
-FUNC 6448 f 0 parse_cmdline
-FUNC 6530 e 0 parse_cmdline
-FUNC 66b0 13 0 parse_cmdline
-FUNC 6970 4 0 parse_cmdline
-FUNC 6aec 7 0 parse_cmdline
-FUNC 6f30 e 0 parse_cmdline
+FUNC 1018 8 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 19b4 e 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 19f4 2 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 1dd0 14 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 1fac 28 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 2058 f 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 209c 9 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 2364 1a 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 253c 4 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 2598 9 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 25cc 10 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 2718 b 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 2730 e 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 28a8 a 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 28fc 2 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 290c 14 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 2b34 f 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 2bfc 10 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 2d88 7 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 3730 d 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 377c 2 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 37b0 10 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 3c38 24 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 3c84 10 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 3db8 1b 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 3e90 e 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 3efc 13 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4110 12 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 42dc f 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 42f0 10 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4518 6 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4610 7 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4684 11 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 46f8 13 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4848 a 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4994 f 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 49bc e 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4aac 1 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4cb8 f 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4ed8 24 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4f10 3 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 4f30 e 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 501c 10 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 5518 3 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 569c 3 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 57bc 12 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 5a50 10 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 5cc0 14 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 5e84 f 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 6448 f 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 6530 e 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 66b0 13 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 6970 4 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 6aec 7 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 6f30 e 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
1fac 6 221 3891
1fb2 9 229 3891
1fbb 2 232 3891
@@ -1632,7 +1632,7 @@ FUNC 65a0 2 0 malloc
5b9e 2 113 504
22f5 2 122 504
FUNC 297c 90 0 _local_unwind4
-FUNC 2a0c 46 0 _unwind_handler4
+FUNC 2a0c 46 0 static void _unwind_handler4()
FUNC 2a52 1c 4 _seh_longjmp_unwind4
FUNC 2a6e 17 0 _EH4_CallFilterFunc
FUNC 2a85 19 0 _EH4_TransferToHandler
@@ -1687,13 +1687,13 @@ FUNC 15b8 1e 0 _initp_misc_winsig
15ca 5 60 2311
15cf 5 61 2311
15d4 2 62 2311
-FUNC 15d8 18 0 siglookup
-FUNC 3538 f 0 siglookup
-FUNC 42c8 14 0 siglookup
-FUNC 45c8 2 0 siglookup
-FUNC 4e1c f 0 siglookup
-FUNC 55f0 2 0 siglookup
-FUNC 63ac f 0 siglookup
+FUNC 15d8 18 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
+FUNC 3538 f 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
+FUNC 42c8 14 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
+FUNC 45c8 2 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
+FUNC 4e1c f 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
+FUNC 55f0 2 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
+FUNC 63ac f 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
63ac 5 629 2311
63b1 a 630 2311
15d8 18 639 2311
@@ -1785,19 +1785,19 @@ FUNC 6c18 5 0 _callnewh
6c1b 2 139 2820
60b0 2 136 2820
60b2 2 139 2820
-FUNC 2274 12 0 _onexit_nolock
-FUNC 2484 10 0 _onexit_nolock
-FUNC 2640 2 0 _onexit_nolock
-FUNC 2b88 10 0 _onexit_nolock
-FUNC 32ac 13 0 _onexit_nolock
-FUNC 4124 15 0 _onexit_nolock
-FUNC 43e8 33 0 _onexit_nolock
-FUNC 45f8 18 0 _onexit_nolock
-FUNC 4a2c 20 0 _onexit_nolock
-FUNC 4b68 2 0 _onexit_nolock
-FUNC 4bb8 18 0 _onexit_nolock
-FUNC 4d84 5 0 _onexit_nolock
-FUNC 6a0c 1a 0 _onexit_nolock
+FUNC 2274 12 0 static * _onexit_nolock( *)
+FUNC 2484 10 0 static * _onexit_nolock( *)
+FUNC 2640 2 0 static * _onexit_nolock( *)
+FUNC 2b88 10 0 static * _onexit_nolock( *)
+FUNC 32ac 13 0 static * _onexit_nolock( *)
+FUNC 4124 15 0 static * _onexit_nolock( *)
+FUNC 43e8 33 0 static * _onexit_nolock( *)
+FUNC 45f8 18 0 static * _onexit_nolock( *)
+FUNC 4a2c 20 0 static * _onexit_nolock( *)
+FUNC 4b68 2 0 static * _onexit_nolock( *)
+FUNC 4bb8 18 0 static * _onexit_nolock( *)
+FUNC 4d84 5 0 static * _onexit_nolock( *)
+FUNC 6a0c 1a 0 static * _onexit_nolock( *)
43e8 8 100 1969
43f0 f 103 1969
43ff f 104 1969
@@ -2170,15 +2170,15 @@ FUNC 6f20 9 0 _realloc_crt
2b5e e 79 333
38b8 4 82 333
38bc 2 83 333
-FUNC 28b4 c 0 CPtoLCID
-FUNC 3d08 6 0 CPtoLCID
-FUNC 5510 6 0 CPtoLCID
-FUNC 5600 6 0 CPtoLCID
-FUNC 5f14 3 0 CPtoLCID
-FUNC 6294 f 0 CPtoLCID
-FUNC 68f4 10 0 CPtoLCID
-FUNC 69cc 6 0 CPtoLCID
-FUNC 6fe0 e 0 CPtoLCID
+FUNC 28b4 c 0 static int CPtoLCID(int)
+FUNC 3d08 6 0 static int CPtoLCID(int)
+FUNC 5510 6 0 static int CPtoLCID(int)
+FUNC 5600 6 0 static int CPtoLCID(int)
+FUNC 5f14 3 0 static int CPtoLCID(int)
+FUNC 6294 f 0 static int CPtoLCID(int)
+FUNC 68f4 10 0 static int CPtoLCID(int)
+FUNC 69cc 6 0 static int CPtoLCID(int)
+FUNC 6fe0 e 0 static int CPtoLCID(int)
68f4 0 329 3326
28b4 c 330 3326
6294 f 330 3326
@@ -2194,11 +2194,11 @@ FUNC 6fe0 e 0 CPtoLCID
69d1 1 346 3326
5600 5 333 3326
5605 1 346 3326
-FUNC 2208 f 0 setSBCS
-FUNC 387c 3 0 setSBCS
-FUNC 48ac f 0 setSBCS
-FUNC 5900 44 0 setSBCS
-FUNC 6be0 b 0 setSBCS
+FUNC 2208 f 0 static void setSBCS(struct threadmbcinfostruct *)
+FUNC 387c 3 0 static void setSBCS(struct threadmbcinfostruct *)
+FUNC 48ac f 0 static void setSBCS(struct threadmbcinfostruct *)
+FUNC 5900 44 0 static void setSBCS(struct threadmbcinfostruct *)
+FUNC 6be0 b 0 static void setSBCS(struct threadmbcinfostruct *)
5900 6 363 3326
5906 11 368 3326
5917 1b 379 3326
@@ -2207,32 +2207,32 @@ FUNC 6be0 b 0 setSBCS
6be0 b 384 3326
48ac f 385 3326
387c 3 386 3326
-FUNC 12dc 18 0 setSBUpLow
-FUNC 1794 f 0 setSBUpLow
-FUNC 1b6c 7 0 setSBUpLow
-FUNC 2548 e 0 setSBUpLow
-FUNC 2c0c 39 0 setSBUpLow
-FUNC 3238 8 0 setSBUpLow
-FUNC 3e54 2 0 setSBUpLow
-FUNC 3ee0 16 0 setSBUpLow
-FUNC 445c 20 0 setSBUpLow
-FUNC 4800 f 0 setSBUpLow
-FUNC 4910 8 0 setSBUpLow
-FUNC 4a8c 12 0 setSBUpLow
-FUNC 4d8c e 0 setSBUpLow
-FUNC 566c f 0 setSBUpLow
-FUNC 56fc c 0 setSBUpLow
-FUNC 59e4 14 0 setSBUpLow
-FUNC 5aa8 6 0 setSBUpLow
-FUNC 5b08 17 0 setSBUpLow
-FUNC 5b60 14 0 setSBUpLow
-FUNC 5db4 12 0 setSBUpLow
-FUNC 6060 c 0 setSBUpLow
-FUNC 60b4 6 0 setSBUpLow
-FUNC 6218 f 0 setSBUpLow
-FUNC 62b8 6a 0 setSBUpLow
-FUNC 697c 3 0 setSBUpLow
-FUNC 6b44 1b 0 setSBUpLow
+FUNC 12dc 18 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 1794 f 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 1b6c 7 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 2548 e 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 2c0c 39 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 3238 8 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 3e54 2 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 3ee0 16 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 445c 20 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 4800 f 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 4910 8 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 4a8c 12 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 4d8c e 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 566c f 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 56fc c 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 59e4 14 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 5aa8 6 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 5b08 17 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 5b60 14 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 5db4 12 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 6060 c 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 60b4 6 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 6218 f 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 62b8 6a 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 697c 3 0 static void setSBUpLow(struct threadmbcinfostruct *)
+FUNC 6b44 1b 0 static void setSBUpLow(struct threadmbcinfostruct *)
2c0c 17 402 3326
2c23 10 412 3326
2c33 12 415 3326
@@ -2317,17 +2317,17 @@ FUNC 6cbc 1c 0 _LocaleUpdate::_LocaleUpdate(localeinfo_struct *)
4d7c 6 255 111
5f68 a 257 111
2904 7 259 111
-FUNC 19fc e 0 getSystemCP
-FUNC 2690 7 0 getSystemCP
-FUNC 2b98 3 0 getSystemCP
-FUNC 3b80 28 0 getSystemCP
-FUNC 3e18 c 0 getSystemCP
-FUNC 4710 f 0 getSystemCP
-FUNC 4868 10 0 getSystemCP
-FUNC 56bc 16 0 getSystemCP
-FUNC 5e20 16 0 getSystemCP
-FUNC 6020 1f 0 getSystemCP
-FUNC 6f64 2 0 getSystemCP
+FUNC 19fc e 0 static int getSystemCP(int)
+FUNC 2690 7 0 static int getSystemCP(int)
+FUNC 2b98 3 0 static int getSystemCP(int)
+FUNC 3b80 28 0 static int getSystemCP(int)
+FUNC 3e18 c 0 static int getSystemCP(int)
+FUNC 4710 f 0 static int getSystemCP(int)
+FUNC 4868 10 0 static int getSystemCP(int)
+FUNC 56bc 16 0 static int getSystemCP(int)
+FUNC 5e20 16 0 static int getSystemCP(int)
+FUNC 6020 1f 0 static int getSystemCP(int)
+FUNC 6f64 2 0 static int getSystemCP(int)
3b80 9 282 3326
3b89 b 284 3326
3b94 6 285 3326
@@ -2485,15 +2485,15 @@ FUNC 6234 13 0 __initmbctable
5ddc a 853 3326
165c 2 858 3326
165e 1 859 3326
-FUNC 1674 7 0 x_ismbbtype_l
-FUNC 1c0c 2c 0 x_ismbbtype_l
-FUNC 3d74 2 0 x_ismbbtype_l
-FUNC 4c90 e 0 x_ismbbtype_l
-FUNC 5430 16 0 x_ismbbtype_l
-FUNC 59b0 2 0 x_ismbbtype_l
-FUNC 6254 10 0 x_ismbbtype_l
-FUNC 643c 3 0 x_ismbbtype_l
-FUNC 6498 10 0 x_ismbbtype_l
+FUNC 1674 7 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
+FUNC 1c0c 2c 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
+FUNC 3d74 2 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
+FUNC 4c90 e 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
+FUNC 5430 16 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
+FUNC 59b0 2 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
+FUNC 6254 10 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
+FUNC 643c 3 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
+FUNC 6498 10 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
1c0c 8 213 3271
1c14 b 214 3271
1c1f 4 219 3271
@@ -2804,7 +2804,7 @@ FUNC 33f1 95 0 _aulldvrm
3482 1 180 2806
3483 3 182 2806
FUNC 675b 20 0 _global_unwind2
-FUNC 677b 45 0 __unwind_handler
+FUNC 677b 45 0 static void __unwind_handler()
FUNC 67c0 84 0 _local_unwind2
FUNC 6844 23 0 _abnormal_termination
FUNC 6867 9 0 _NLG_Notify1
@@ -3199,52 +3199,52 @@ FUNC 6734 14 0 realloc
5976 6 112 618
1048 16 103 618
2ae0 8 105 618
-FUNC 1000 7 0 __crtLCMapStringA_stat
-FUNC 11b0 14 0 __crtLCMapStringA_stat
-FUNC 17c4 8 0 __crtLCMapStringA_stat
-FUNC 1ac4 6 0 __crtLCMapStringA_stat
-FUNC 21f4 c 0 __crtLCMapStringA_stat
-FUNC 2234 9 0 __crtLCMapStringA_stat
-FUNC 2354 f 0 __crtLCMapStringA_stat
-FUNC 242c 12 0 __crtLCMapStringA_stat
-FUNC 2710 3 0 __crtLCMapStringA_stat
-FUNC 2794 b 0 __crtLCMapStringA_stat
-FUNC 28d0 13 0 __crtLCMapStringA_stat
-FUNC 31f8 5 0 __crtLCMapStringA_stat
-FUNC 327c 14 0 __crtLCMapStringA_stat
-FUNC 32c0 4a 0 __crtLCMapStringA_stat
-FUNC 336c 20 0 __crtLCMapStringA_stat
-FUNC 36f8 f 0 __crtLCMapStringA_stat
-FUNC 37e0 10 0 __crtLCMapStringA_stat
-FUNC 3c30 1 0 __crtLCMapStringA_stat
-FUNC 3f94 e 0 __crtLCMapStringA_stat
-FUNC 4300 14 0 __crtLCMapStringA_stat
-FUNC 4338 11 0 __crtLCMapStringA_stat
-FUNC 497c 16 0 __crtLCMapStringA_stat
-FUNC 4b10 15 0 __crtLCMapStringA_stat
-FUNC 4c70 14 0 __crtLCMapStringA_stat
-FUNC 4ce8 10 0 __crtLCMapStringA_stat
-FUNC 4db4 1e 0 __crtLCMapStringA_stat
-FUNC 4e68 12 0 __crtLCMapStringA_stat
-FUNC 54e8 3 0 __crtLCMapStringA_stat
-FUNC 5574 14 0 __crtLCMapStringA_stat
-FUNC 55d0 2 0 __crtLCMapStringA_stat
-FUNC 55f8 8 0 __crtLCMapStringA_stat
-FUNC 5628 8 0 __crtLCMapStringA_stat
-FUNC 578c 3 0 __crtLCMapStringA_stat
-FUNC 5838 24 0 __crtLCMapStringA_stat
-FUNC 58f4 c 0 __crtLCMapStringA_stat
-FUNC 5f44 7 0 __crtLCMapStringA_stat
-FUNC 61fc f 0 __crtLCMapStringA_stat
-FUNC 6328 14 0 __crtLCMapStringA_stat
-FUNC 63a0 c 0 __crtLCMapStringA_stat
-FUNC 6404 6 0 __crtLCMapStringA_stat
-FUNC 65e8 28 0 __crtLCMapStringA_stat
-FUNC 6624 10 0 __crtLCMapStringA_stat
-FUNC 6ad4 16 0 __crtLCMapStringA_stat
-FUNC 6d80 e 0 __crtLCMapStringA_stat
-FUNC 6eb4 3 0 __crtLCMapStringA_stat
-FUNC 6f10 f 0 __crtLCMapStringA_stat
+FUNC 1000 7 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 11b0 14 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 17c4 8 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 1ac4 6 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 21f4 c 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 2234 9 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 2354 f 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 242c 12 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 2710 3 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 2794 b 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 28d0 13 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 31f8 5 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 327c 14 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 32c0 4a 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 336c 20 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 36f8 f 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 37e0 10 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 3c30 1 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 3f94 e 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 4300 14 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 4338 11 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 497c 16 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 4b10 15 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 4c70 14 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 4ce8 10 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 4db4 1e 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 4e68 12 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 54e8 3 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 5574 14 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 55d0 2 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 55f8 8 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 5628 8 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 578c 3 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 5838 24 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 58f4 c 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 5f44 7 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 61fc f 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 6328 14 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 63a0 c 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 6404 6 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 65e8 28 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 6624 10 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 6ad4 16 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 6d80 e 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 6eb4 3 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
+FUNC 6f10 f 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
65e8 12 96 3447
65fa 16 101 3447
2354 f 102 3447
@@ -3307,24 +3307,24 @@ FUNC 610c 47 0 __crtLCMapStringA
3c24 7 271 3447
611f 34 271 3447
3204 2 272 3447
-FUNC 1198 3 0 __crtGetStringTypeA_stat
-FUNC 17b4 e 0 __crtGetStringTypeA_stat
-FUNC 19ac 2 0 __crtGetStringTypeA_stat
-FUNC 24a4 14 0 __crtGetStringTypeA_stat
-FUNC 3318 33 0 __crtGetStringTypeA_stat
-FUNC 357c 2b 0 __crtGetStringTypeA_stat
-FUNC 43c4 b 0 __crtGetStringTypeA_stat
-FUNC 4624 14 0 __crtGetStringTypeA_stat
-FUNC 4d9c 11 0 __crtGetStringTypeA_stat
-FUNC 5094 a 0 __crtGetStringTypeA_stat
-FUNC 5b4c 12 0 __crtGetStringTypeA_stat
-FUNC 5efc c 0 __crtGetStringTypeA_stat
-FUNC 5f38 6 0 __crtGetStringTypeA_stat
-FUNC 6420 c 0 __crtGetStringTypeA_stat
-FUNC 68c0 14 0 __crtGetStringTypeA_stat
-FUNC 6910 12 0 __crtGetStringTypeA_stat
-FUNC 6bf0 28 0 __crtGetStringTypeA_stat
-FUNC 6c20 8 0 __crtGetStringTypeA_stat
+FUNC 1198 3 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 17b4 e 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 19ac 2 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 24a4 14 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 3318 33 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 357c 2b 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 43c4 b 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 4624 14 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 4d9c 11 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 5094 a 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 5b4c 12 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 5efc c 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 5f38 6 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 6420 c 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 68c0 14 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 6910 12 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 6bf0 28 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
+FUNC 6c20 8 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
6bf0 12 63 3507
6c02 7 67 3507
6c09 f 83 3507
diff --git a/src/tools/windows/dump_syms/testdata/omap_reorder_funcs.sym b/src/tools/windows/dump_syms/testdata/omap_reorder_funcs.sym
index efd4ffff..cae41484 100644
--- a/src/tools/windows/dump_syms/testdata/omap_reorder_funcs.sym
+++ b/src/tools/windows/dump_syms/testdata/omap_reorder_funcs.sym
@@ -290,7 +290,7 @@ FUNC 41e2 54 0 main
4211 f 62 1
4220 12 64 1
4232 4 65 1
-FUNC 4242 a 0 google_breakpad::i
+FUNC 4242 a 0 static int google_breakpad::i()
4242 3 51 1
4245 5 52 1
424a 2 53 1
@@ -316,14 +316,14 @@ FUNC 2307 b 0 operator delete(void *)
2307 5 20 2875
230c 1 24 2875
230d 5 23 2875
-FUNC 3238 29 0 fast_error_exit
+FUNC 3238 29 0 static void fast_error_exit(int)
3238 5 326 4250
323d 9 335 4250
3246 5 337 4250
324b 8 339 4250
3253 c 340 4250
325f 2 341 4250
-FUNC 32ed 161 0 __tmainCRTStartup
+FUNC 32ed 161 0 static int __tmainCRTStartup()
32ed c 196 4250
32f9 a 214 4250
3303 b 216 4250
@@ -505,7 +505,7 @@ FUNC 147f 97 0 _cinit
1506 c 303 4186
1512 2 307 4186
1514 2 308 4186
-FUNC 4504 140 0 doexit
+FUNC 4504 140 0 static void doexit(int, int, int)
4504 c 489 4186
4510 8 507 4186
4518 4 508 4186
@@ -675,7 +675,7 @@ FUNC 255c dc 0 _setenvp
261f 7 130 3838
2626 5 131 3838
262b d 133 3838
-FUNC 54b7 19a 0 parse_cmdline
+FUNC 54b7 19a 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
54b7 6 221 3891
54bd 9 229 3891
54c6 2 232 3891
@@ -1194,7 +1194,7 @@ FUNC 2312 94 0 malloc
23a1 3 113 504
23a4 2 122 504
FUNC 43b2 90 0 _local_unwind4
-FUNC 4442 46 0 _unwind_handler4
+FUNC 4442 46 0 static void _unwind_handler4()
FUNC 4488 1c 4 _seh_longjmp_unwind4
FUNC 44a4 17 0 _EH4_CallFilterFunc
FUNC 44bb 19 0 _EH4_TransferToHandler
@@ -1242,7 +1242,7 @@ FUNC 215a 1e 0 _initp_misc_winsig
216c 5 60 2311
2171 5 61 2311
2176 2 62 2311
-FUNC 24f8 37 0 siglookup
+FUNC 24f8 37 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
24f8 5 629 2311
24fd a 630 2311
2507 14 639 2311
@@ -1328,7 +1328,7 @@ FUNC 4644 28 0 _callnewh
4666 2 139 2820
4668 2 136 2820
466a 2 139 2820
-FUNC 4c24 b6 0 _onexit_nolock
+FUNC 4c24 b6 0 static * _onexit_nolock( *)
4c24 8 100 1969
4c2c f 103 1969
4c3b f 104 1969
@@ -1535,7 +1535,7 @@ FUNC 4e39 4e 0 _realloc_crt
4e7c 5 79 333
4e81 4 82 333
4e85 2 83 333
-FUNC 2bc5 2f 0 CPtoLCID
+FUNC 2bc5 2f 0 static int CPtoLCID(int)
2bc5 0 329 3326
2bc5 14 330 3326
2bd9 2 345 3326
@@ -1548,7 +1548,7 @@ FUNC 2bc5 2f 0 CPtoLCID
2bed 1 346 3326
2bee 5 333 3326
2bf3 1 346 3326
-FUNC 1f3c 64 0 setSBCS
+FUNC 1f3c 64 0 static void setSBCS(struct threadmbcinfostruct *)
1f3c 6 363 3326
1f42 11 368 3326
1f53 1b 379 3326
@@ -1557,7 +1557,7 @@ FUNC 1f3c 64 0 setSBCS
1f89 b 384 3326
1f94 9 385 3326
1f9d 3 386 3326
-FUNC 466c 190 0 setSBUpLow
+FUNC 466c 190 0 static void setSBUpLow(struct threadmbcinfostruct *)
466c 17 402 3326
4683 10 412 3326
4693 f 415 3326
@@ -1623,7 +1623,7 @@ FUNC 48f9 87 0 _LocaleUpdate::_LocaleUpdate(localeinfo_struct *)
496d 2 255 111
496f a 257 111
4979 7 259 111
-FUNC 10e5 7c 0 getSystemCP
+FUNC 10e5 7c 0 static int getSystemCP(int)
10e5 9 282 3326
10ee b 284 3326
10f9 6 285 3326
@@ -1734,7 +1734,7 @@ FUNC 1cd3 1e 0 __initmbctable
1ce4 a 853 3326
1cee 2 858 3326
1cf0 1 859 3326
-FUNC 2638 53 0 x_ismbbtype_l
+FUNC 2638 53 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
2638 8 213 3271
2640 b 214 3271
264b 4 219 3271
@@ -1953,7 +1953,7 @@ FUNC 1223 95 0 _aulldvrm
12b4 1 180 2806
12b5 3 182 2806
FUNC 28d7 20 0 _global_unwind2
-FUNC 28f7 45 0 __unwind_handler
+FUNC 28f7 45 0 static void __unwind_handler()
FUNC 293c 84 0 _local_unwind2
FUNC 29c0 23 0 _abnormal_termination
FUNC 29e3 9 0 _NLG_Notify1
@@ -2301,7 +2301,7 @@ FUNC 5067 ad 0 realloc
50f8 2 112 618
50fa 16 103 618
5110 4 105 618
-FUNC 1904 1e7 0 __crtLCMapStringA_stat
+FUNC 1904 1e7 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
1904 12 96 3447
1916 c 101 3447
1922 17 102 3447
@@ -2338,7 +2338,7 @@ FUNC 22a3 46 0 __crtLCMapStringA
22ab b 259 3447
22b6 31 271 3447
22e7 2 272 3447
-FUNC 47fc e7 0 __crtGetStringTypeA_stat
+FUNC 47fc e7 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
47fc 12 63 3507
480e 7 67 3507
4815 5 83 3507
diff --git a/src/tools/windows/dump_syms/testdata/omap_stretched.sym b/src/tools/windows/dump_syms/testdata/omap_stretched.sym
index a948e5bf..a48ddb64 100644
--- a/src/tools/windows/dump_syms/testdata/omap_stretched.sym
+++ b/src/tools/windows/dump_syms/testdata/omap_stretched.sym
@@ -290,7 +290,7 @@ FUNC 1000 54 0 main
102f f 62 1
103e 12 64 1
1050 4 65 1
-FUNC 1060 a 0 google_breakpad::i
+FUNC 1060 a 0 static int google_breakpad::i()
1060 3 51 1
1063 5 52 1
1068 2 53 1
@@ -320,14 +320,14 @@ FUNC 1197 b 0 operator delete(void *)
1197 5 20 2875
119c 1 24 2875
119d 5 23 2875
-FUNC 11a2 29 0 fast_error_exit
+FUNC 11a2 29 0 static void fast_error_exit(int)
11a2 5 326 4250
11a7 9 335 4250
11b0 5 337 4250
11b5 8 339 4250
11bd c 340 4250
11c9 2 341 4250
-FUNC 11cb 161 0 __tmainCRTStartup
+FUNC 11cb 161 0 static int __tmainCRTStartup()
11cb c 196 4250
11d7 a 214 4250
11e1 b 216 4250
@@ -511,7 +511,7 @@ FUNC 15a0 a1 0 _cinit
1631 c 303 4186
163d 2 307 4186
163f 2 308 4186
-FUNC 1641 140 0 doexit
+FUNC 1641 140 0 static void doexit(int, int, int)
1641 c 489 4186
164d 8 507 4186
1655 4 508 4186
@@ -684,9 +684,9 @@ FUNC 1c5e dc 0 _setenvp
1d21 7 130 3838
1d28 5 131 3838
1d2d d 133 3838
-FUNC 1d3a 2ee 0 parse_cmdline
-FUNC 2032 3 0 parse_cmdline
-FUNC 203f 4 0 parse_cmdline
+FUNC 1d3a 2ee 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 2032 3 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
+FUNC 203f 4 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
1d3a 6 221 3891
1d40 7 229 3891
1d51 2 229 3891
@@ -1237,7 +1237,7 @@ FUNC 330c b6 0 malloc
33bd 3 113 504
33c0 2 122 504
FUNC 33c2 90 0 _local_unwind4
-FUNC 3452 46 0 _unwind_handler4
+FUNC 3452 46 0 static void _unwind_handler4()
FUNC 3498 1c 4 _seh_longjmp_unwind4
FUNC 34b4 17 0 _EH4_CallFilterFunc
FUNC 34cb 19 0 _EH4_TransferToHandler
@@ -1285,8 +1285,8 @@ FUNC 35b3 1e 0 _initp_misc_winsig
35c5 5 60 2311
35ca 5 61 2311
35cf 2 62 2311
-FUNC 35d1 38 0 siglookup
-FUNC 3613 9 0 siglookup
+FUNC 35d1 38 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
+FUNC 3613 9 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
35d1 5 629 2311
35d6 a 630 2311
35ea 14 639 2311
@@ -1373,7 +1373,7 @@ FUNC 37f9 28 0 _callnewh
381b 2 139 2820
381d 2 136 2820
381f 2 139 2820
-FUNC 3821 c0 0 _onexit_nolock
+FUNC 3821 c0 0 static * _onexit_nolock( *)
3821 8 100 1969
3829 f 103 1969
3838 f 104 1969
@@ -1599,7 +1599,7 @@ FUNC 4038 4e 0 _realloc_crt
407b 5 79 333
4080 4 82 333
4084 2 83 333
-FUNC 4086 2f 0 CPtoLCID
+FUNC 4086 2f 0 static int CPtoLCID(int)
4086 0 329 3326
4086 14 330 3326
409a 2 345 3326
@@ -1612,8 +1612,8 @@ FUNC 4086 2f 0 CPtoLCID
40ae 1 346 3326
40af 5 333 3326
40b4 1 346 3326
-FUNC 40b5 ab 0 setSBCS
-FUNC 416a 9 0 setSBCS
+FUNC 40b5 ab 0 static void setSBCS(struct threadmbcinfostruct *)
+FUNC 416a 9 0 static void setSBCS(struct threadmbcinfostruct *)
40b5 6 363 3326
40bb 11 368 3326
40cc 36 379 3326
@@ -1627,7 +1627,7 @@ FUNC 416a 9 0 setSBCS
415d 3 385 3326
416a 6 385 3326
4170 3 386 3326
-FUNC 4173 246 0 setSBUpLow
+FUNC 4173 246 0 static void setSBUpLow(struct threadmbcinfostruct *)
4173 17 402 3326
418a 7 412 3326
419b 9 412 3326
@@ -1706,8 +1706,8 @@ FUNC 445d 15d 0 _LocaleUpdate::_LocaleUpdate(localeinfo_struct *)
45a3 3 257 111
45b0 3 257 111
45b3 7 259 111
-FUNC 45ba 87 0 getSystemCP
-FUNC 464b 9 0 getSystemCP
+FUNC 45ba 87 0 static int getSystemCP(int)
+FUNC 464b 9 0 static int getSystemCP(int)
45ba 9 282 3326
45c3 b 284 3326
45ce 6 285 3326
@@ -1828,8 +1828,8 @@ FUNC 4ac0 1e 0 __initmbctable
4ad1 a 853 3326
4adb 2 858 3326
4add 1 859 3326
-FUNC 4ade 70 0 x_ismbbtype_l
-FUNC 4b58 6 0 x_ismbbtype_l
+FUNC 4ade 70 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
+FUNC 4b58 6 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
4ade 8 213 3271
4ae6 b 214 3271
4af1 4 219 3271
@@ -2062,7 +2062,7 @@ FUNC 5169 95 0 _aulldvrm
51fa 1 180 2806
51fb 3 182 2806
FUNC 51fe 20 0 _global_unwind2
-FUNC 521e 45 0 __unwind_handler
+FUNC 521e 45 0 static void __unwind_handler()
FUNC 5263 84 0 _local_unwind2
FUNC 52e7 23 0 _abnormal_termination
FUNC 530a 9 0 _NLG_Notify1
@@ -2416,7 +2416,7 @@ FUNC 59a4 6 0 realloc
5986 14 103 618
59a4 2 103 618
59a6 4 105 618
-FUNC 59aa 22d 0 __crtLCMapStringA_stat
+FUNC 59aa 22d 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
59aa 12 96 3447
59bc c 101 3447
59c8 21 102 3447
@@ -2457,7 +2457,7 @@ FUNC 5c21 6 0 __crtLCMapStringA
5bea 2d 271 3447
5c21 4 271 3447
5c25 2 272 3447
-FUNC 5c27 112 0 __crtGetStringTypeA_stat
+FUNC 5c27 112 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
5c27 12 63 3507
5c39 7 67 3507
5c40 5 83 3507
diff --git a/src/tools/windows/dump_syms/testdata/omap_stretched_filled.sym b/src/tools/windows/dump_syms/testdata/omap_stretched_filled.sym
index 293e3c4d..410801e2 100644
--- a/src/tools/windows/dump_syms/testdata/omap_stretched_filled.sym
+++ b/src/tools/windows/dump_syms/testdata/omap_stretched_filled.sym
@@ -290,7 +290,7 @@ FUNC 1000 54 0 main
102f f 62 1
103e 12 64 1
1050 4 65 1
-FUNC 1060 a 0 google_breakpad::i
+FUNC 1060 a 0 static int google_breakpad::i()
1060 3 51 1
1063 5 52 1
1068 2 53 1
@@ -316,14 +316,14 @@ FUNC 1197 b 0 operator delete(void *)
1197 5 20 2875
119c 1 24 2875
119d 5 23 2875
-FUNC 11a2 29 0 fast_error_exit
+FUNC 11a2 29 0 static void fast_error_exit(int)
11a2 5 326 4250
11a7 9 335 4250
11b0 5 337 4250
11b5 8 339 4250
11bd c 340 4250
11c9 2 341 4250
-FUNC 11cb 161 0 __tmainCRTStartup
+FUNC 11cb 161 0 static int __tmainCRTStartup()
11cb c 196 4250
11d7 a 214 4250
11e1 b 216 4250
@@ -505,7 +505,7 @@ FUNC 15a0 a1 0 _cinit
1631 c 303 4186
163d 2 307 4186
163f 2 308 4186
-FUNC 1641 140 0 doexit
+FUNC 1641 140 0 static void doexit(int, int, int)
1641 c 489 4186
164d 8 507 4186
1655 4 508 4186
@@ -675,7 +675,7 @@ FUNC 1c5e dc 0 _setenvp
1d21 7 130 3838
1d28 5 131 3838
1d2d d 133 3838
-FUNC 1d3a 309 0 parse_cmdline
+FUNC 1d3a 309 0 static void parse_cmdline(char *, char * *, char *, int *, int *)
1d3a 6 221 3891
1d40 13 229 3891
1d53 2 232 3891
@@ -1194,7 +1194,7 @@ FUNC 330c b6 0 malloc
33bd 3 113 504
33c0 2 122 504
FUNC 33c2 90 0 _local_unwind4
-FUNC 3452 46 0 _unwind_handler4
+FUNC 3452 46 0 static void _unwind_handler4()
FUNC 3498 1c 4 _seh_longjmp_unwind4
FUNC 34b4 17 0 _EH4_CallFilterFunc
FUNC 34cb 19 0 _EH4_TransferToHandler
@@ -1242,7 +1242,7 @@ FUNC 35b3 1e 0 _initp_misc_winsig
35c5 5 60 2311
35ca 5 61 2311
35cf 2 62 2311
-FUNC 35d1 4b 0 siglookup
+FUNC 35d1 4b 0 static struct _XCPT_ACTION * siglookup(int, struct _XCPT_ACTION *)
35d1 5 629 2311
35d6 a 630 2311
35e0 1e 639 2311
@@ -1328,7 +1328,7 @@ FUNC 37f9 28 0 _callnewh
381b 2 139 2820
381d 2 136 2820
381f 2 139 2820
-FUNC 3821 c0 0 _onexit_nolock
+FUNC 3821 c0 0 static * _onexit_nolock( *)
3821 8 100 1969
3829 f 103 1969
3838 f 104 1969
@@ -1535,7 +1535,7 @@ FUNC 4038 4e 0 _realloc_crt
407b 5 79 333
4080 4 82 333
4084 2 83 333
-FUNC 4086 2f 0 CPtoLCID
+FUNC 4086 2f 0 static int CPtoLCID(int)
4086 0 329 3326
4086 14 330 3326
409a 2 345 3326
@@ -1548,7 +1548,7 @@ FUNC 4086 2f 0 CPtoLCID
40ae 1 346 3326
40af 5 333 3326
40b4 1 346 3326
-FUNC 40b5 be 0 setSBCS
+FUNC 40b5 be 0 static void setSBCS(struct threadmbcinfostruct *)
40b5 6 363 3326
40bb 11 368 3326
40cc 4b 379 3326
@@ -1557,7 +1557,7 @@ FUNC 40b5 be 0 setSBCS
4147 b 384 3326
4152 1e 385 3326
4170 3 386 3326
-FUNC 4173 246 0 setSBUpLow
+FUNC 4173 246 0 static void setSBUpLow(struct threadmbcinfostruct *)
4173 17 402 3326
418a 1a 412 3326
41a4 f 415 3326
@@ -1623,7 +1623,7 @@ FUNC 445d 15d 0 _LocaleUpdate::_LocaleUpdate(localeinfo_struct *)
457f 2 255 111
4581 32 257 111
45b3 7 259 111
-FUNC 45ba 9a 0 getSystemCP
+FUNC 45ba 9a 0 static int getSystemCP(int)
45ba 9 282 3326
45c3 b 284 3326
45ce 6 285 3326
@@ -1734,7 +1734,7 @@ FUNC 4ac0 1e 0 __initmbctable
4ad1 a 853 3326
4adb 2 858 3326
4add 1 859 3326
-FUNC 4ade 80 0 x_ismbbtype_l
+FUNC 4ade 80 0 static int x_ismbbtype_l(struct localeinfo_struct *, unsigned int, int, int)
4ade 8 213 3271
4ae6 b 214 3271
4af1 4 219 3271
@@ -1953,7 +1953,7 @@ FUNC 5169 95 0 _aulldvrm
51fa 1 180 2806
51fb 3 182 2806
FUNC 51fe 20 0 _global_unwind2
-FUNC 521e 45 0 __unwind_handler
+FUNC 521e 45 0 static void __unwind_handler()
FUNC 5263 84 0 _local_unwind2
FUNC 52e7 23 0 _abnormal_termination
FUNC 530a 9 0 _NLG_Notify1
@@ -2301,7 +2301,7 @@ FUNC 58df cb 0 realloc
5984 2 112 618
5986 20 103 618
59a6 4 105 618
-FUNC 59aa 22d 0 __crtLCMapStringA_stat
+FUNC 59aa 22d 0 static int __crtLCMapStringA_stat(struct localeinfo_struct *, unsigned long, unsigned long, const char *, int, char *, int, int, int)
59aa 12 96 3447
59bc c 101 3447
59c8 21 102 3447
@@ -2338,7 +2338,7 @@ FUNC 5bd7 50 0 __crtLCMapStringA
5bdf b 259 3447
5bea 3b 271 3447
5c25 2 272 3447
-FUNC 5c27 112 0 __crtGetStringTypeA_stat
+FUNC 5c27 112 0 static int __crtGetStringTypeA_stat(struct localeinfo_struct *, unsigned long, const char *, int, unsigned short *, int, int, int)
5c27 12 63 3507
5c39 7 67 3507
5c40 5 83 3507