Skip to content

Fixed gcc 15.1.1 warnings from -W -Wall -Wextra. #61

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
bobbens wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed gcc 15.1.1 warnings from -W -Wall -Wextra. #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9a3351b
Fixed gcc 15.1.1 warnings from -W -Wall -Wextra.
bobbens Jun 10, 2025
04d2da4
Fixed ISO C90 forbids mixed declarations and code [-Wdeclaration-afte…
bobbens Jun 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 9 additions & 12 deletions ext/yaml/emitter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,13 +47,12 @@ static int
emit_STREAM_START (lua_State *L, lyaml_emitter *emitter)
{
yaml_event_t event;
yaml_encoding_t yaml_encoding;
yaml_encoding_t yaml_encoding = YAML_ANY_ENCODING;
const char *encoding = NULL;

RAWGET_STRDUP (encoding); lua_pop (L, 1);

#define MENTRY(_s) (STREQ (encoding, #_s)) { yaml_encoding = YAML_##_s##_ENCODING; }
if (encoding == NULL) { yaml_encoding = YAML_ANY_ENCODING; } else
if MENTRY( UTF8 ) else
if MENTRY( UTF16LE ) else
if MENTRY( UTF16BE ) else
Expand All @@ -80,6 +79,7 @@ static int
emit_STREAM_END (lua_State *L, lyaml_emitter *emitter)
{
yaml_event_t event;
(void) L;
yaml_stream_end_event_initialize (&event);
return yaml_emitter_emit (&emitter->emitter, &event);
}
Expand Down Expand Up @@ -165,15 +165,14 @@ static int
emit_MAPPING_START (lua_State *L, lyaml_emitter *emitter)
{
yaml_event_t event;
yaml_mapping_style_t yaml_style;
yaml_mapping_style_t yaml_style = YAML_ANY_MAPPING_STYLE;
yaml_char_t *anchor = NULL, *tag = NULL;
int implicit = 1;
const char *style = NULL;

RAWGET_STRDUP (style); lua_pop (L, 1);

#define MENTRY(_s) (STREQ (style, #_s)) { yaml_style = YAML_##_s##_MAPPING_STYLE; }
if (style == NULL) { yaml_style = YAML_ANY_MAPPING_STYLE; } else
if MENTRY( BLOCK ) else
if MENTRY( FLOW ) else
{
Expand All @@ -184,13 +183,12 @@ emit_MAPPING_START (lua_State *L, lyaml_emitter *emitter)
}
#undef MENTRY

if (style) free ((void *) style);

RAWGET_YAML_CHARP (anchor); lua_pop (L, 1);
RAWGET_YAML_CHARP (tag); lua_pop (L, 1);
RAWGET_BOOLEAN (implicit); lua_pop (L, 1);

yaml_mapping_start_event_initialize (&event, anchor, tag, implicit, yaml_style);
if (style) free ((void *) style);
return yaml_emitter_emit (&emitter->emitter, &event);
}

Expand All @@ -200,6 +198,7 @@ static int
emit_MAPPING_END (lua_State *L, lyaml_emitter *emitter)
{
yaml_event_t event;
(void) L;
yaml_mapping_end_event_initialize (&event);
return yaml_emitter_emit (&emitter->emitter, &event);
}
Expand All @@ -210,15 +209,14 @@ static int
emit_SEQUENCE_START (lua_State *L, lyaml_emitter *emitter)
{
yaml_event_t event;
yaml_sequence_style_t yaml_style;
yaml_sequence_style_t yaml_style = YAML_ANY_SEQUENCE_STYLE;
yaml_char_t *anchor = NULL, *tag = NULL;
int implicit = 1;
const char *style = NULL;

RAWGET_STRDUP (style); lua_pop (L, 1);

#define MENTRY(_s) (STREQ (style, #_s)) { yaml_style = YAML_##_s##_SEQUENCE_STYLE; }
if (style == NULL) { yaml_style = YAML_ANY_SEQUENCE_STYLE; } else
if MENTRY( BLOCK ) else
if MENTRY( FLOW ) else
{
Expand All @@ -229,13 +227,12 @@ emit_SEQUENCE_START (lua_State *L, lyaml_emitter *emitter)
}
#undef MENTRY

if (style) free ((void *) style);

RAWGET_YAML_CHARP (anchor); lua_pop (L, 1);
RAWGET_YAML_CHARP (tag); lua_pop (L, 1);
RAWGET_BOOLEAN (implicit); lua_pop (L, 1);

yaml_sequence_start_event_initialize (&event, anchor, tag, implicit, yaml_style);
if (style) free ((void *) style);
return yaml_emitter_emit (&emitter->emitter, &event);
}

Expand All @@ -245,6 +242,7 @@ static int
emit_SEQUENCE_END (lua_State *L, lyaml_emitter *emitter)
{
yaml_event_t event;
(void) L;
yaml_sequence_end_event_initialize (&event);
return yaml_emitter_emit (&emitter->emitter, &event);
}
Expand All @@ -255,15 +253,14 @@ static int
emit_SCALAR (lua_State *L, lyaml_emitter *emitter)
{
yaml_event_t event;
yaml_scalar_style_t yaml_style;
yaml_scalar_style_t yaml_style = YAML_ANY_SCALAR_STYLE;
yaml_char_t *anchor = NULL, *tag = NULL, *value;
int length = 0, plain_implicit = 1, quoted_implicit = 1;
const char *style = NULL;

RAWGET_STRDUP (style); lua_pop (L, 1);

#define MENTRY(_s) (STREQ (style, #_s)) { yaml_style = YAML_##_s##_SCALAR_STYLE; }
if (style == NULL) { yaml_style = YAML_ANY_SCALAR_STYLE; } else
if MENTRY( PLAIN ) else
if MENTRY( SINGLE_QUOTED ) else
if MENTRY( DOUBLE_QUOTED ) else
Expand Down
9 changes: 4 additions & 5 deletions ext/yaml/parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ parse_STREAM_START (lyaml_parser *parser)
{
#define EVENTF(_f) (parser->event.data.stream_start._f)
lua_State *L = parser->L;
const char *encoding;
const char *encoding = NULL;

switch (EVENTF (encoding))
{
Expand Down Expand Up @@ -182,7 +182,7 @@ parse_SCALAR (lyaml_parser *parser)
{
#define EVENTF(_f) (parser->event.data.scalar._f)
lua_State *L = parser->L;
const char *style;
const char *style = NULL;

switch (EVENTF (style))
{
Expand Down Expand Up @@ -219,7 +219,7 @@ parse_SEQUENCE_START (lyaml_parser *parser)
{
#define EVENTF(_f) (parser->event.data.sequence_start._f)
lua_State *L = parser->L;
const char *style;
const char *style = NULL;

switch (EVENTF (style))
{
Expand Down Expand Up @@ -249,7 +249,7 @@ parse_MAPPING_START (lyaml_parser *parser)
{
#define EVENTF(_f) (parser->event.data.mapping_start._f)
lua_State *L = parser->L;
const char *style;
const char *style = NULL;

switch (EVENTF (style))
{
Expand Down Expand Up @@ -311,7 +311,6 @@ static int
event_iter (lua_State *L)
{
lyaml_parser *parser = (lyaml_parser *)lua_touserdata(L, lua_upvalueindex(1));
char *str;

parser_delete_event (parser);
if (yaml_parser_parse (&parser->parser, &parser->event) != 1)
Expand Down
5 changes: 2 additions & 3 deletions ext/yaml/scanner.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ scan_STREAM_START (lyaml_scanner *scanner)
{
#define EVENTF(_f) (scanner->token.data.stream_start._f)
lua_State *L = scanner->L;
const char *encoding;
const char *encoding = NULL;

switch (EVENTF (encoding))
{
Expand Down Expand Up @@ -167,7 +167,7 @@ scan_SCALAR (lyaml_scanner *scanner)
{
#define EVENTF(_f) (scanner->token.data.scalar._f)
lua_State *L = scanner->L;
const char *style;
const char *style = NULL;

switch (EVENTF (style))
{
Expand Down Expand Up @@ -230,7 +230,6 @@ static int
token_iter (lua_State *L)
{
lyaml_scanner *scanner = (lyaml_scanner *)lua_touserdata(L, lua_upvalueindex(1));
char *str;

scanner_delete_token (scanner);
if (yaml_parser_scan (&scanner->parser, &scanner->token) != 1)
Expand Down
Loading