Skip to content

Commit 712c201

Browse files
committed
fix various compiler warnings
1 parent baee908 commit 712c201

File tree

5 files changed

+19
-10
lines changed

5 files changed

+19
-10
lines changed

CMakeLists.txt

+10-1
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,34 @@ if (NOT FIPS_IMPORT)
66
endif()
77

88
fips_begin_lib(sdlang)
9+
fips_vs_warning_level(3)
910
fips_files(
1011
sdlang.c
1112
sdlang.h
1213
sdlang.inl
1314
)
1415
fips_end_lib()
1516

17+
if (FIPS_MSVC)
18+
target_compile_definitions(sdlang PRIVATE _CRT_SECURE_NO_WARNINGS)
19+
endif()
20+
1621
if (FIPS_GCC)
17-
set_target_properties(sdlang PROPERTIES COMPILE_FLAGS "-Wno-implicit-fallthrough")
22+
target_compile_options(sdlang PRIVATE "-Wno-implicit-fallthrough")
1823
endif()
1924

2025
if (NOT FIPS_IMPORT)
2126
include_directories(.)
2227
fips_begin_app(parser cmdline)
28+
fips_vs_warning_level(3)
2329
fips_dir(samples GROUP ".")
2430
fips_files(
2531
parser.c
2632
)
2733
fips_deps(sdlang)
2834
fips_end_app()
2935
fips_finish()
36+
if (FIPS_MSVC)
37+
target_compile_definitions(parser PRIVATE _CRT_SECURE_NO_WARNINGS)
38+
endif()
3039
endif()

samples/parser.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ static void emit_token(const struct sdlang_token_t* token, void* user)
4040
}
4141

4242
const char* text = token->string.from;
43-
const int len = token->string.to - token->string.from;
43+
const int len = (const int)(token->string.to - token->string.from);
4444

4545
switch (token->type)
4646
{
@@ -215,7 +215,7 @@ int main(int argc, char* argv[])
215215
}
216216

217217
file = fopen(argv[argc - 1], "rb");
218-
218+
219219
if (file == NULL)
220220
{
221221
fprintf(stderr, "failed to open: %s\n", argv[argc - 1]);

sdlang.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ void sdlang_emit_token(const struct sdlang_token_t* token, void* user)
2525
}
2626

2727
const char* value = token->string.from;
28-
const int len = token->string.to - value;
28+
const int len = (const int)(token->string.to - value);
2929

3030
#define size_minus_one(dst) \
3131
((int)sizeof(vtbl->dst) - 1)

sdlang.inl

+4-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ int sdlang_parse(size_t (*stream)(void* ptr, size_t size, void* user), void* use
5252
break;
5353
}
5454

55-
len = stream(p, space, user);
55+
len = (int)stream(p, space, user);
5656
pe = p + len;
5757

5858
if (len < space)
@@ -140,7 +140,7 @@ tr32:
140140
/* #line 127 "sdlang.rl" */
141141
{te = p+1;{p--; {
142142
check_stack_size(&p, pe, top, curline);
143-
{stack[top++] = 21; goto st23;}}}}
143+
{stack[top++] = 21;goto st23;}}}}
144144
goto st21;
145145
st21:
146146
/* #line 1 "NONE" */
@@ -264,7 +264,7 @@ tr46:
264264
emit(SDLANG_TOKEN_BLOCK, ts, te, curline, user);
265265
{
266266
check_stack_size(&p, pe, top, curline);
267-
{stack[top++] = 23; goto st23;}}
267+
{stack[top++] = 23;goto st23;}}
268268
}}
269269
goto st23;
270270
tr47:
@@ -1286,7 +1286,7 @@ case 57:
12861286
}
12871287
else
12881288
{
1289-
have = pe - ts;
1289+
have = (int)(pe - ts);
12901290
SDLANG_MEMMOVE(buf, ts, have);
12911291
te = buf + (te - ts);
12921292
ts = buf;

sdlang.rl

+2-2
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ int sdlang_parse(size_t (*stream)(void* ptr, size_t size, void* user), void* use
152152
break;
153153
}
154154

155-
len = stream(p, space, user);
155+
len = (int)stream(p, space, user);
156156
pe = p + len;
157157

158158
if (len < space)
@@ -181,7 +181,7 @@ int sdlang_parse(size_t (*stream)(void* ptr, size_t size, void* user), void* use
181181
}
182182
else
183183
{
184-
have = pe - ts;
184+
have = (int)(pe - ts);
185185
SDLANG_MEMMOVE(buf, ts, have);
186186
te = buf + (te - ts);
187187
ts = buf;

0 commit comments

Comments
 (0)