Skip to content

Commit 3f0acf7

Browse files
committed
Rename fgets parameter to fix NetBSD
Fixes [Bug #21165]
1 parent 21ffaa4 commit 3f0acf7

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

include/prism.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -93,11 +93,11 @@ typedef char * (pm_parse_stream_fgets_t)(char *string, int size, void *stream);
9393
* @param parser The parser to use.
9494
* @param buffer The buffer to use.
9595
* @param stream The stream to parse.
96-
* @param fgets The function to use to read from the stream.
96+
* @param stream_fgets The function to use to read from the stream.
9797
* @param options The optional options to use when parsing.
9898
* @return The AST representing the source.
9999
*/
100-
PRISM_EXPORTED_FUNCTION pm_node_t * pm_parse_stream(pm_parser_t *parser, pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *fgets, const pm_options_t *options);
100+
PRISM_EXPORTED_FUNCTION pm_node_t * pm_parse_stream(pm_parser_t *parser, pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets, const pm_options_t *options);
101101

102102
// We optionally support serializing to a binary string. For systems that don't
103103
// want or need this functionality, it can be turned off with the
@@ -110,10 +110,10 @@ PRISM_EXPORTED_FUNCTION pm_node_t * pm_parse_stream(pm_parser_t *parser, pm_buff
110110
*
111111
* @param buffer The buffer to serialize to.
112112
* @param stream The stream to parse.
113-
* @param fgets The function to use to read from the stream.
113+
* @param stream_fgets The function to use to read from the stream.
114114
* @param data The optional data to pass to the parser.
115115
*/
116-
PRISM_EXPORTED_FUNCTION void pm_serialize_parse_stream(pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *fgets, const char *data);
116+
PRISM_EXPORTED_FUNCTION void pm_serialize_parse_stream(pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets, const char *data);
117117

118118
/**
119119
* Serialize the given list of comments to the given buffer.

src/prism.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22773,11 +22773,11 @@ pm_parse(pm_parser_t *parser) {
2277322773
* otherwise return true.
2277422774
*/
2277522775
static bool
22776-
pm_parse_stream_read(pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *fgets) {
22776+
pm_parse_stream_read(pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets) {
2277722777
#define LINE_SIZE 4096
2277822778
char line[LINE_SIZE];
2277922779

22780-
while (memset(line, '\n', LINE_SIZE), fgets(line, LINE_SIZE, stream) != NULL) {
22780+
while (memset(line, '\n', LINE_SIZE), stream_fgets(line, LINE_SIZE, stream) != NULL) {
2278122781
size_t length = LINE_SIZE;
2278222782
while (length > 0 && line[length - 1] == '\n') length--;
2278322783

@@ -22844,16 +22844,16 @@ pm_parse_stream_unterminated_heredoc_p(pm_parser_t *parser) {
2284422844
* can stream stdin in to Ruby so we need to support a streaming API.
2284522845
*/
2284622846
PRISM_EXPORTED_FUNCTION pm_node_t *
22847-
pm_parse_stream(pm_parser_t *parser, pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *fgets, const pm_options_t *options) {
22847+
pm_parse_stream(pm_parser_t *parser, pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets, const pm_options_t *options) {
2284822848
pm_buffer_init(buffer);
2284922849

22850-
bool eof = pm_parse_stream_read(buffer, stream, fgets);
22850+
bool eof = pm_parse_stream_read(buffer, stream, stream_fgets);
2285122851
pm_parser_init(parser, (const uint8_t *) pm_buffer_value(buffer), pm_buffer_length(buffer), options);
2285222852
pm_node_t *node = pm_parse(parser);
2285322853

2285422854
while (!eof && parser->error_list.size > 0 && (parser->lex_modes.index > 0 || pm_parse_stream_unterminated_heredoc_p(parser))) {
2285522855
pm_node_destroy(parser, node);
22856-
eof = pm_parse_stream_read(buffer, stream, fgets);
22856+
eof = pm_parse_stream_read(buffer, stream, stream_fgets);
2285722857

2285822858
pm_parser_free(parser);
2285922859
pm_parser_init(parser, (const uint8_t *) pm_buffer_value(buffer), pm_buffer_length(buffer), options);
@@ -22945,13 +22945,13 @@ pm_serialize_parse(pm_buffer_t *buffer, const uint8_t *source, size_t size, cons
2294522945
* given stream into to the given buffer.
2294622946
*/
2294722947
PRISM_EXPORTED_FUNCTION void
22948-
pm_serialize_parse_stream(pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *fgets, const char *data) {
22948+
pm_serialize_parse_stream(pm_buffer_t *buffer, void *stream, pm_parse_stream_fgets_t *stream_fgets, const char *data) {
2294922949
pm_parser_t parser;
2295022950
pm_options_t options = { 0 };
2295122951
pm_options_read(&options, data);
2295222952

2295322953
pm_buffer_t parser_buffer;
22954-
pm_node_t *node = pm_parse_stream(&parser, &parser_buffer, stream, fgets, &options);
22954+
pm_node_t *node = pm_parse_stream(&parser, &parser_buffer, stream, stream_fgets, &options);
2295522955
pm_serialize_header(buffer);
2295622956
pm_serialize_content(&parser, node, buffer);
2295722957
pm_buffer_append_byte(buffer, '\0');

0 commit comments

Comments
 (0)