Skip to content

Commit 6183f8a

Browse files
committed
crt headers: add const qualifiers in crt/stdio.bi, crt/sys/stat.bi, crt/wchar.bi
1 parent 4ffcf3b commit 6183f8a

File tree

4 files changed

+47
-46
lines changed

4 files changed

+47
-46
lines changed

changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Version 1.09.0
66
- fbc-tests: add gcc compiler options -Wno-tautological-compare to quiet the constant comparison warnings in the test-suite
77
- crt headers: guard some definitions in crt/sys/win32/stat.bi to avoid collisions of 'stat' and 'chmod' with some other crt headers
88
- crt headers: add const qualifiers in crt/stdlib.bi
9+
- crt headers: add const qualifiers in crt/stdio.bi, crt/sys/stat.bi, crt/wchar.bi
910

1011
[added]
1112
- fbc: add '-z fbrt' command line option to link against libfbrt*.a instead of libfb*.a

inc/crt/stdio.bi

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -30,42 +30,42 @@
3030
#endif
3131

3232
extern "c"
33-
declare function rename (byval as zstring ptr, byval as zstring ptr) as long
34-
declare function fopen (byval as zstring ptr, byval as zstring ptr) as FILE ptr
35-
declare function freopen (byval as zstring ptr, byval as zstring ptr, byval as FILE ptr) as FILE ptr
33+
declare function rename (byval as const zstring ptr, byval as const zstring ptr) as long
34+
declare function fopen (byval as const zstring ptr, byval as const zstring ptr) as FILE ptr
35+
declare function freopen (byval as const zstring ptr, byval as const zstring ptr, byval as FILE ptr) as FILE ptr
3636
declare function fflush (byval as FILE ptr) as long
3737
declare function fclose (byval as FILE ptr) as long
38-
declare function remove (byval as zstring ptr) as long
38+
declare function remove (byval as const zstring ptr) as long
3939
declare function tmpfile () as FILE ptr
4040
declare function tmpnam (byval as zstring ptr) as zstring ptr
4141
declare function tempnam (byval as zstring ptr, byval as zstring ptr) as zstring ptr
4242
declare function setvbuf (byval as FILE ptr, byval as zstring ptr, byval as long, byval as size_t) as long
4343
declare sub setbuf (byval as FILE ptr, byval as zstring ptr)
44-
declare function fprintf (byval as FILE ptr, byval as zstring ptr, ...) as long
45-
declare function printf (byval as zstring ptr, ...) as long
46-
declare function sprintf (byval as zstring ptr, byval as zstring ptr, ...) as long
47-
declare function vfprintf (byval as FILE ptr, byval as zstring ptr, byval as va_list) as long
48-
declare function vprintf (byval as zstring ptr, byval as va_list) as long
49-
declare function vsprintf (byval as zstring ptr, byval as zstring ptr, byval as va_list) as long
50-
declare function vscanf (byval as zstring ptr, byval as va_list) as long
51-
declare function vfscanf (byval as FILE ptr, byval as zstring ptr, byval as va_list) as long
52-
declare function vsscanf (byval as zstring ptr, byval as zstring ptr, byval as va_list) as long
53-
declare function fscanf (byval as FILE ptr, byval as zstring ptr, ...) as long
54-
declare function scanf (byval as zstring ptr, ...) as long
55-
declare function sscanf (byval as zstring ptr, byval as zstring ptr, ...) as long
44+
declare function fprintf (byval as FILE ptr, byval as const zstring ptr, ...) as long
45+
declare function printf (byval as const zstring ptr, ...) as long
46+
declare function sprintf (byval as zstring ptr, byval as const zstring ptr, ...) as long
47+
declare function vfprintf (byval as FILE ptr, byval as const zstring ptr, byval as va_list) as long
48+
declare function vprintf (byval as const zstring ptr, byval as va_list) as long
49+
declare function vsprintf (byval as zstring ptr, byval as const zstring ptr, byval as va_list) as long
50+
declare function vscanf (byval as const zstring ptr, byval as va_list) as long
51+
declare function vfscanf (byval as FILE ptr, byval as const zstring ptr, byval as va_list) as long
52+
declare function vsscanf (byval as const zstring ptr, byval as const zstring ptr, byval as va_list) as long
53+
declare function fscanf (byval as FILE ptr, byval as const zstring ptr, ...) as long
54+
declare function scanf (byval as const zstring ptr, ...) as long
55+
declare function sscanf (byval as const zstring ptr, byval as const zstring ptr, ...) as long
5656
declare function fgetc (byval as FILE ptr) as long
5757
declare function fgets (byval as zstring ptr, byval as long, byval as FILE ptr) as zstring ptr
5858
declare function fputc (byval as long, byval as FILE ptr) as long
59-
declare function fputs (byval as zstring ptr, byval as FILE ptr) as long
59+
declare function fputs (byval as const zstring ptr, byval as FILE ptr) as long
6060
declare function getc (byval as FILE ptr) as long
6161
declare function getchar () as long
6262
declare function gets (byval as zstring ptr) as zstring ptr
6363
declare function putc (byval as long, byval as FILE ptr) as long
6464
declare function putchar (byval as long) as long
65-
declare function puts (byval as zstring ptr) as long
65+
declare function puts (byval as const zstring ptr) as long
6666
declare function ungetc (byval as long, byval as FILE ptr) as long
6767
declare function fread (byval as any ptr, byval as size_t, byval as size_t, byval as FILE ptr) as size_t
68-
declare function fwrite (byval as any ptr, byval as size_t, byval as size_t, byval as FILE ptr) as size_t
68+
declare function fwrite (byval as const any ptr, byval as size_t, byval as size_t, byval as FILE ptr) as size_t
6969
declare function fseek (byval as FILE ptr, byval as clong, byval as long) as long
7070
declare function ftell (byval as FILE ptr) as clong
7171
declare sub rewind (byval as FILE ptr)
@@ -74,31 +74,31 @@ declare function fsetpos (byval as FILE ptr, byval as fpos_t ptr) as long
7474
declare sub clearerr (byval as FILE ptr)
7575
declare function feof (byval as FILE ptr) as long
7676
declare function ferror (byval as FILE ptr) as long
77-
declare sub perror (byval as zstring ptr)
78-
declare function fwprintf (byval as FILE ptr, byval as wchar_t ptr, ...) as long
79-
declare function wprintf (byval as wchar_t ptr, ...) as long
80-
declare function swprintf (byval as wchar_t ptr, byval as wchar_t ptr, ...) as long
81-
declare function vfwprintf (byval as FILE ptr, byval as wchar_t ptr, byval as va_list) as long
82-
declare function vwprintf (byval as wchar_t ptr, byval as va_list) as long
83-
declare function vswprintf (byval as wchar_t ptr, byval as wchar_t ptr, byval as va_list) as long
84-
declare function fwscanf (byval as FILE ptr, byval as wchar_t ptr, ...) as long
85-
declare function wscanf (byval as wchar_t ptr, ...) as long
86-
declare function swscanf (byval as wchar_t ptr, byval as wchar_t ptr, ...) as long
77+
declare sub perror (byval as const zstring ptr)
78+
declare function fwprintf (byval as FILE ptr, byval as const wchar_t ptr, ...) as long
79+
declare function wprintf (byval as const wchar_t ptr, ...) as long
80+
declare function swprintf (byval as wchar_t ptr, byval as const wchar_t ptr, ...) as long
81+
declare function vfwprintf (byval as FILE ptr, byval as const wchar_t ptr, byval as va_list) as long
82+
declare function vwprintf (byval as const wchar_t ptr, byval as va_list) as long
83+
declare function vswprintf (byval as wchar_t ptr, byval as const wchar_t ptr, byval as va_list) as long
84+
declare function fwscanf (byval as FILE ptr, byval as const wchar_t ptr, ...) as long
85+
declare function wscanf (byval as const wchar_t ptr, ...) as long
86+
declare function swscanf (byval as const wchar_t ptr, byval as const wchar_t ptr, ...) as long
8787
declare function fgetwc (byval as FILE ptr) as wint_t
8888
declare function fputwc (byval as wchar_t, byval as FILE ptr) as wint_t
8989
declare function ungetwc (byval as wchar_t, byval as FILE ptr) as wint_t
9090
declare function fgetws (byval as wchar_t ptr, byval as long, byval as FILE ptr) as wchar_t ptr
91-
declare function fputws (byval as wchar_t ptr, byval as FILE ptr) as long
91+
declare function fputws (byval as const wchar_t ptr, byval as FILE ptr) as long
9292
declare function getwc (byval as FILE ptr) as wint_t
9393
declare function getwchar () as wint_t
9494
declare function putwc (byval as wint_t, byval as FILE ptr) as wint_t
9595
declare function putwchar (byval as wint_t) as wint_t
96-
declare function snwprintf (byval s as wchar_t ptr, byval n as size_t, byval format as wchar_t ptr, ...) as long
97-
declare function vsnwprintf (byval s as wchar_t ptr, byval n as size_t, byval format as wchar_t ptr, byval arg as va_list) as long
98-
declare function vwscanf (byval as wchar_t ptr, byval as va_list) as long
99-
declare function vfwscanf (byval as FILE ptr, byval as wchar_t ptr, byval as va_list) as long
100-
declare function vswscanf (byval as wchar_t ptr, byval as wchar_t ptr, byval as va_list) as long
101-
declare function wpopen (byval as wchar_t ptr, byval as wchar_t ptr) as FILE ptr
96+
declare function snwprintf (byval s as wchar_t ptr, byval n as size_t, byval format as const wchar_t ptr, ...) as long
97+
declare function vsnwprintf (byval s as wchar_t ptr, byval n as size_t, byval format as const wchar_t ptr, byval arg as va_list) as long
98+
declare function vwscanf (byval as const wchar_t ptr, byval as va_list) as long
99+
declare function vfwscanf (byval as FILE ptr, byval as const wchar_t ptr, byval as va_list) as long
100+
declare function vswscanf (byval as const wchar_t ptr, byval as const wchar_t ptr, byval as va_list) as long
101+
declare function wpopen (byval as const wchar_t ptr, byval as const wchar_t ptr) as FILE ptr
102102
end extern
103103

104104
#endif

inc/crt/sys/stat.bi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
extern "C"
2222

2323
declare function fstat (byval as long, byval as _stat ptr) as long
24-
declare function chmod (byval as zstring ptr, byval as long) as long
25-
declare function stat (byval as zstring ptr, byval as _stat ptr) as long
24+
declare function chmod (byval as const zstring ptr, byval as long) as long
25+
declare function stat (byval as const zstring ptr, byval as _stat ptr) as long
2626

2727
end extern
2828

inc/crt/wchar.bi

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,18 +26,18 @@
2626

2727
extern "c"
2828
declare function btowc (byval as long) as wint_t
29-
declare function mbrlen (byval as zstring ptr, byval as size_t, byval as mbstate_t ptr) as size_t
30-
declare function mbrtowc (byval as wchar_t ptr, byval as zstring ptr, byval as size_t, byval as mbstate_t ptr) as size_t
31-
declare function mbsrtowcs (byval as wchar_t ptr, byval as zstring ptr ptr, byval as size_t, byval as mbstate_t ptr) as size_t
29+
declare function mbrlen (byval as const zstring ptr, byval as size_t, byval as mbstate_t ptr) as size_t
30+
declare function mbrtowc (byval as const wchar_t ptr, byval as zstring ptr, byval as size_t, byval as mbstate_t ptr) as size_t
31+
declare function mbsrtowcs (byval as wchar_t ptr, byval as const zstring ptr ptr, byval as size_t, byval as mbstate_t ptr) as size_t
3232
declare function wcrtomb (byval as zstring ptr, byval as wchar_t, byval as mbstate_t ptr) as size_t
33-
declare function wcsrtombs (byval as zstring ptr, byval as wchar_t ptr ptr, byval as size_t, byval as mbstate_t ptr) as size_t
33+
declare function wcsrtombs (byval as const zstring ptr, byval as wchar_t ptr ptr, byval as size_t, byval as mbstate_t ptr) as size_t
3434
declare function wctob (byval as wint_t) as integer
3535
declare function fwide (byval stream as FILE ptr, byval mode as long) as long
36-
declare function mbsinit (byval ps as mbstate_t ptr) as long
36+
declare function mbsinit (byval ps as const mbstate_t ptr) as long
3737
declare function wmemset (byval s as wchar_t ptr, byval c as wchar_t, byval n as size_t) as wchar_t ptr
38-
declare function wmemchr (byval s as wchar_t ptr, byval c as wchar_t, byval n as size_t) as wchar_t ptr
39-
declare function wmemcmp (byval s1 as wchar_t ptr, byval s2 as wchar_t ptr, byval n as size_t) as integer
40-
declare function wmemmove (byval s1 as wchar_t ptr, byval s2 as wchar_t ptr, byval n as size_t) as wchar_t ptr
38+
declare function wmemchr (byval s as const wchar_t ptr, byval c as wchar_t, byval n as size_t) as wchar_t ptr
39+
declare function wmemcmp (byval s1 as const wchar_t ptr, byval s2 as const wchar_t ptr, byval n as size_t) as integer
40+
declare function wmemmove (byval s1 as wchar_t ptr, byval s2 as const wchar_t ptr, byval n as size_t) as wchar_t ptr
4141
end extern
4242

4343
#endif

0 commit comments

Comments
 (0)