Skip to content

Commit f57e875

Browse files
orbitcowboyorbitcowboy
committed
Astyle run; Extended std.cfg and avr.cfg about a few more functions.
1 parent ae81b09 commit f57e875

File tree

3 files changed

+65
-13
lines changed

3 files changed

+65
-13
lines changed

‎cfg/avr.cfg‎

Lines changed: 42 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,13 +120,54 @@
120120
<!-- stdio.h -->
121121
<define name="fdev_set_udata(stream, u)" value="do { (stream)- > udata = u; } while(0)"/>
122122
<define name="fdev_get_udata(stream)" value="((stream)- > udata)"/>
123+
<define name="fdev_setup_stream" value="(stream, put, get, rwflag)" />
123124
<define name="_FDEV_SETUP_READ" value="__SRD"/>
124125
<define name="_FDEV_SETUP_WRITE" value="__SWR"/>
125126
<define name="_FDEV_SETUP_RW" value="(__SRD | __SWR)"/>
126127
<define name="_FDEV_ERR" value="(-1)"/>
127128
<define name="_FDEV_EOF" value="(-2)"/>
129+
<define name="FDEV_SETUP_STREAM" value="(put, get, rwflag)" />
128130
<define name="putc(__c, __stream)" value="fputc(__c, __stream)"/>
129131
<define name="putchar(__c)" value="fputc(__c, stdout)"/>
130132
<define name="getc(__stream)" value="fgetc(__stream)"/>
131-
<define name="getchar()" value="fgetc(stdin)"/>
133+
<define name="getchar()" value="fgetc(stdin)"/>
134+
<define name="SEEK_SET" value="0"/>
135+
<define name="SEEK_CUR" value="1"/>
136+
<define name="SEEK_END" value="2"/>
137+
<function name="vfprintf_P">
138+
<noreturn>false</noreturn>
139+
<leak-ignore/>
140+
<arg nr="1"><not-null/><not-uninit/></arg><formatstr/>
141+
<arg nr="2"><formatstr/></arg>
142+
<arg nr="any"><not-uninit/></arg>
143+
</function>
144+
<function name="printf_P">
145+
<noreturn>false</noreturn>
146+
<leak-ignore/>
147+
<formatstr/> <arg nr="1"><formatstr/></arg>
148+
<arg nr="any"><not-uninit/></arg>
149+
</function>
150+
<function name="sprintf_P">
151+
<noreturn>false</noreturn>
152+
<leak-ignore/>
153+
<formatstr/> <arg nr="2"><formatstr/></arg>
154+
</function>
155+
<function name="snprintf_P">
156+
<noreturn>false</noreturn>
157+
<leak-ignore/>
158+
<formatstr/> <arg nr="3"><formatstr/></arg>
159+
</function>
160+
<function name="vsprintf_P">
161+
<noreturn>false</noreturn>
162+
<leak-ignore/>
163+
<formatstr/> <arg nr="2"><formatstr/></arg>
164+
</function>
165+
<function name="vsnprintf_P">
166+
<noreturn>false</noreturn>
167+
<leak-ignore/>
168+
<formatstr/> <arg nr="3"><formatstr/></arg>
169+
</function>
170+
<!-- stdlib.h -->
171+
<define name="__ptr_t" value="void *"/>
172+
<define name="RAND_MAX" value="0x7FFF"/>
132173
</def>

‎cfg/std.cfg‎

Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,8 @@
3838
<function name="floor"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg></function>
3939
<function name="fmod"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
4040
<function name="fopen"><noreturn>false</noreturn><arg nr="1"><not-null/><not-uninit/></arg><arg nr="2"><not-null/><not-uninit/></arg></function>
41-
<function name="fprintf"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><formatstr/><arg nr="2"><formatstr/></arg></function>
41+
<function name="fprintf"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><formatstr/><arg nr="2"><formatstr/></arg><arg nr="any"><not-uninit/></arg></function>
42+
<function name="vfprintf"><noreturn>false</noreturn><leak-ignore/><arg nr="1"><not-null/><not-uninit/></arg><formatstr/><arg nr="2"><formatstr/></arg><arg nr="any"><not-uninit/></arg></function>
4243
<function name="fputc">
4344
<noreturn>false</noreturn>
4445
<leak-ignore/>
@@ -202,7 +203,15 @@
202203
</function>
203204
<function name="printf">
204205
<noreturn>false</noreturn>
205-
<formatstr/> <arg nr="1"><formatstr/></arg> <arg nr="any"><not-uninit/></arg>
206+
<leak-ignore/>
207+
<formatstr/> <arg nr="1"><formatstr/></arg>
208+
<arg nr="any"><not-uninit/></arg>
209+
</function>
210+
<function name="vprintf">
211+
<noreturn>false</noreturn>
212+
<leak-ignore/>
213+
<formatstr/> <arg nr="1"><formatstr/></arg>
214+
<arg nr="any"><not-uninit/></arg>
206215
</function>
207216
<function name="putc">
208217
<noreturn>false</noreturn>
@@ -282,17 +291,19 @@
282291
<function name="wcstoull"> <leak-ignore/> <arg nr="3"><valid>0,2:36</valid></arg> </function>
283292

284293

285-
<function name="wprintf"> <noreturn>false</noreturn> <formatstr/> <arg nr="1"><formatstr/></arg> </function>
286-
<function name="sprintf"> <noreturn>false</noreturn> <formatstr/> <arg nr="2"><formatstr/></arg> </function>
287-
<function name="fwprintf"> <noreturn>false</noreturn> <formatstr/> <arg nr="2"><formatstr/></arg> </function>
288-
<function name="snprintf"> <noreturn>false</noreturn> <formatstr/> <arg nr="3"><formatstr/></arg> </function>
289-
<function name="fnprintf"> <noreturn>false</noreturn> <formatstr/> <arg nr="3"><formatstr/></arg> </function>
294+
<function name="wprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/> <arg nr="1"><formatstr/></arg> </function>
295+
<function name="sprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/> <arg nr="2"><formatstr/></arg> </function>
296+
<function name="vsprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/> <arg nr="2"><formatstr/></arg> </function>
297+
<function name="fwprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/> <arg nr="2"><formatstr/></arg> </function>
298+
<function name="snprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/> <arg nr="3"><formatstr/></arg> </function>
299+
<function name="vsnprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/> <arg nr="3"><formatstr/></arg> </function>
300+
<function name="fnprintf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr/> <arg nr="3"><formatstr/></arg> </function>
290301

291-
<function name="wscanf"> <noreturn>false</noreturn> <formatstr scan="true"/> <arg nr="1"><formatstr/></arg> </function>
292-
<function name="sscanf"> <noreturn>false</noreturn> <formatstr scan="true"/> <arg nr="2"><formatstr/></arg> </function>
302+
<function name="wscanf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr scan="true"/> <arg nr="1"><formatstr/></arg> </function>
303+
<function name="sscanf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr scan="true"/> <arg nr="2"><formatstr/></arg> </function>
293304

294-
<function name="fwscanf"> <noreturn>false</noreturn> <formatstr scan="true"/> <arg nr="2"><formatstr/></arg> </function>
295-
<function name="swscanf"> <noreturn>false</noreturn> <formatstr scan="true"/> <arg nr="2"><formatstr/></arg> </function>
305+
<function name="fwscanf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr scan="true"/> <arg nr="2"><formatstr/></arg> </function>
306+
<function name="swscanf"> <noreturn>false</noreturn> <leak-ignore/> <formatstr scan="true"/> <arg nr="2"><formatstr/></arg> </function>
296307

297308
<podtype name="int8_t" sign="s" size="1"/>
298309
<podtype name="int16_t" sign="s" size="2"/>

‎test/testnullpointer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2105,7 +2105,7 @@ class TestNullPointer : public TestFixture {
21052105
TODO_ASSERT_EQUALS("[test.cpp:3] -> [test.cpp:2]: (warning) Possible null pointer dereference: p - otherwise it is redundant to check it against null.\n"
21062106
"[test.cpp:4] -> [test.cpp:2]: (warning) Possible null pointer dereference: p - otherwise it is redundant to check it against null.\n"
21072107
"[test.cpp:5] -> [test.cpp:2]: (warning) Possible null pointer dereference: p - otherwise it is redundant to check it against null.\n"
2108-
"[test.cpp:6] -> [test.cpp:2]: (warning) Possible null pointer dereference: p - otherwise it is redundant to check it against null.\n",
2108+
"[test.cpp:6] -> [test.cpp:2]: (warning) Possible null pointer dereference: p - otherwise it is redundant to check it against null.\n",
21092109
"[test.cpp:3] -> [test.cpp:2]: (warning) Possible null pointer dereference: p - otherwise it is redundant to check it against null.\n"
21102110
"[test.cpp:4] -> [test.cpp:2]: (warning) Possible null pointer dereference: p - otherwise it is redundant to check it against null.\n",
21112111
errout.str());

0 commit comments

Comments
 (0)