Skip to content

Commit c8662a7

Browse files
danmardanmar
committed
Reverted changes to std.cfg. It somehow causes test failures.
1 parent ff0f4ce commit c8662a7

1 file changed

Lines changed: 44 additions & 42 deletions

File tree

‎cfg/std.cfg‎

Lines changed: 44 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2321,9 +2321,9 @@
23212321
<minsize type="argvalue" arg="3"/>
23222322
</arg>
23232323
<arg nr="3">
2324-
<not-uninit/>
23252324
<not-bool/>
23262325
<valid>0:</valid>
2326+
<not-uninit/>
23272327
</arg>
23282328
</function>
23292329
<!-- wchar_t * wmemcpy(wchar_t *ct, const wchar_t *cs, size_t n);-->
@@ -2340,9 +2340,9 @@
23402340
<minsize type="argvalue" arg="3"/>
23412341
</arg>
23422342
<arg nr="3">
2343-
<not-uninit/>
23442343
<not-bool/>
23452344
<valid>0:</valid>
2345+
<not-uninit/>
23462346
</arg>
23472347
</function>
23482348
<!-- void * memmove(void *ct, const void *cs, size_t n); -->
@@ -2359,9 +2359,9 @@
23592359
<minsize type="argvalue" arg="3"/>
23602360
</arg>
23612361
<arg nr="3">
2362-
<not-uninit/>
23632362
<not-bool/>
23642363
<valid>0:</valid>
2364+
<not-uninit/>
23652365
</arg>
23662366
</function>
23672367
<!-- wchar_t * wmemmove(wchar_t *ct, const wchar_t *cs, size_t n); -->
@@ -2378,9 +2378,9 @@
23782378
<minsize type="argvalue" arg="3"/>
23792379
</arg>
23802380
<arg nr="3">
2381-
<not-uninit/>
23822381
<not-bool/>
23832382
<valid>0:</valid>
2383+
<not-uninit/>
23842384
</arg>
23852385
</function>
23862386
<!-- void *memset(void *s, int c, size_t n); -->
@@ -2395,9 +2395,9 @@
23952395
<not-uninit/>
23962396
</arg>
23972397
<arg nr="3">
2398-
<not-uninit/>
23992398
<not-bool/>
24002399
<valid>0:</valid>
2400+
<not-uninit/>
24012401
</arg>
24022402
</function>
24032403
<!-- wchar_t *wmemset(wchar_t *s, wchar_t c, size_t n); -->
@@ -2412,9 +2412,9 @@
24122412
<not-uninit/>
24132413
</arg>
24142414
<arg nr="3">
2415-
<not-uninit/>
24162415
<not-bool/>
24172416
<valid>0:</valid>
2417+
<not-uninit/>
24182418
</arg>
24192419
</function>
24202420
<!-- time_t mktime(struct tm *tp); -->
@@ -2754,40 +2754,40 @@
27542754
<leak-ignore/>
27552755
<formatstr scan="true"/>
27562756
<arg nr="1">
2757+
<not-uninit/>
27572758
<formatstr/>
27582759
<not-null/>
2759-
<not-uninit/>
27602760
</arg>
27612761
</function>
27622762
<!-- int vsscanf(const char *s, const char *format, va_list arg); -->
27632763
<function name="vsscanf,std::vsscanf">
27642764
<noreturn>false</noreturn>
27652765
<leak-ignore/>
2766+
<formatstr scan="true"/>
27662767
<arg nr="1">
2767-
<not-null/>
27682768
<not-uninit/>
2769+
<not-null/>
27692770
</arg>
2770-
<formatstr scan="true"/>
27712771
<arg nr="2">
2772+
<not-uninit/>
27722773
<formatstr/>
27732774
<not-null/>
2774-
<not-uninit/>
27752775
</arg>
27762776
<arg nr="3"/>
27772777
</function>
27782778
<!-- int vswscanf(const wchar_t *s, const wchar_t *format, va_list arg); -->
27792779
<function name="vswscanf,std::vswscanf">
27802780
<noreturn>false</noreturn>
27812781
<leak-ignore/>
2782+
<formatstr scan="true"/>
27822783
<arg nr="1">
2783-
<not-null/>
27842784
<not-uninit/>
2785+
<not-null/>
27852786
</arg>
2786-
<formatstr scan="true"/>
27872787
<arg nr="2">
2788+
<not-uninit/>
27882789
<formatstr/>
27892790
<not-null/>
2790-
<not-uninit/>
27912791
</arg>
27922792
<arg nr="3"/>
27932793
</function>
@@ -2797,9 +2797,9 @@
27972797
<leak-ignore/>
27982798
<formatstr scan="true"/>
27992799
<arg nr="1">
2800+
<not-uninit/>
28002801
<formatstr/>
28012802
<not-null/>
2802-
<not-uninit/>
28032803
</arg>
28042804
<arg nr="2"/>
28052805
</function>
@@ -2850,6 +2850,16 @@
28502850
<leak-ignore/>
28512851
<arg nr="1"/>
28522852
</function>
2853+
<memory>
2854+
<dealloc>free</dealloc>
2855+
<alloc init="false">malloc</alloc>
2856+
<alloc init="true">calloc</alloc>
2857+
</memory>
2858+
<resource>
2859+
<dealloc>fclose</dealloc>
2860+
<alloc init="true">fopen</alloc>
2861+
<alloc init="true">tmpfile</alloc>
2862+
</resource>
28532863
<!-- char * strcat(char *deststr, const char *srcstr); -->
28542864
<function name="strcat,std::strcat">
28552865
<noreturn>false</noreturn>
@@ -3382,8 +3392,9 @@
33823392
</function>
33833393
<!-- char *strtok(char *s, const char *ct); -->
33843394
<function name="strtok">
3385-
<pure/>
3395+
<!-- strtok may modify the first argument, so using the return value is not mandatory -->
33863396
<noreturn>false</noreturn>
3397+
<pure/>
33873398
<leak-ignore/>
33883399
<arg nr="1">
33893400
<not-uninit/>
@@ -3580,13 +3591,13 @@
35803591
<function name="sprintf">
35813592
<noreturn>false</noreturn>
35823593
<leak-ignore/>
3594+
<formatstr/>
35833595
<arg nr="1">
35843596
<minsize type="strlen" arg="2"/>
35853597
</arg>
3586-
<formatstr/>
35873598
<arg nr="2">
3588-
<formatstr/>
35893599
<not-null/>
3600+
<formatstr/>
35903601
</arg>
35913602
</function>
35923603
<!-- int swprintf(wchar_t *s, size_t n, const wchar_t *format, ...); -->
@@ -3772,39 +3783,17 @@
37723783
</function>
37733784
<!-- struct tmx *zonetime(const time_t *tp, int zone); -->
37743785
<function name="zonetime">
3775-
<use-retval/>
37763786
<noreturn>false</noreturn>
37773787
<leak-ignore/>
3788+
<use-retval/>
37783789
<arg nr="1">
3779-
<not-null/>
37803790
<not-uninit/>
3791+
<not-null/>
37813792
</arg>
37823793
<arg nr="2">
37833794
<not-uninit/>
37843795
</arg>
37853796
</function>
3786-
<!--Not part of standard, but widely supported by runtime libraries-->
3787-
<function name="itoa">
3788-
<noreturn>false</noreturn>
3789-
<leak-ignore/>
3790-
<arg nr="1">
3791-
<not-uninit/>
3792-
</arg>
3793-
<arg nr="2">
3794-
<not-null/>
3795-
</arg>
3796-
<arg nr="3"/>
3797-
</function>
3798-
<memory>
3799-
<alloc>malloc</alloc>
3800-
<alloc init="true">calloc</alloc>
3801-
<dealloc>free</dealloc>
3802-
</memory>
3803-
<resource>
3804-
<alloc init="true">fopen</alloc>
3805-
<alloc init="true">tmpfile</alloc>
3806-
<dealloc>fclose</dealloc>
3807-
</resource>
38083797
<container id="stdContainer" endPattern="&gt; !!::">
38093798
<type templateParameter="0"/>
38103799
<size>
@@ -3878,7 +3867,8 @@
38783867
<container id="stdBasicString" startPattern="std :: basic_string &lt;" inherits="stdAllString">
38793868
<type templateParameter="0"/>
38803869
</container>
3881-
<container id="stdString" startPattern="std :: string|wstring|u16string|u32string" inherits="stdAllString"/>
3870+
<container id="stdString" startPattern="std :: string|wstring|u16string|u32string" endPattern="" inherits="stdAllString">
3871+
</container>
38823872
<podtype name="int8_t" sign="s" size="1"/>
38833873
<podtype name="int16_t" sign="s" size="2"/>
38843874
<podtype name="int32_t" sign="s" size="4"/>
@@ -3929,4 +3919,16 @@
39293919
<podtype name="mbstate_t"/>
39303920
<podtype name="wint_t"/>
39313921
<podtype name="jmp_buf"/>
3922+
<!--Not part of standard, but widely supported by runtime libraries-->
3923+
<function name="itoa">
3924+
<noreturn>false</noreturn>
3925+
<leak-ignore/>
3926+
<arg nr="1">
3927+
<not-uninit/>
3928+
</arg>
3929+
<arg nr="2">
3930+
<not-null/>
3931+
</arg>
3932+
<arg nr="3"/>
3933+
</function>
39323934
</def>

0 commit comments

Comments
 (0)