git.iko.soy/typeable/yaml
on master help sign in
Fix clang warnings
c1a93a1Hamish Mackenzie
c/helper.c+8−7
compare with master
unifiedsplit
@@ -13,10 +13,10 @@ int buffer_append(void *ext, unsigned char *str, size_t size)
13{
13{
14 buffer_t *b = ext;
14 buffer_t *b = ext;
15 int new_size, new_used;
15 int new_size, new_used;
16− char *tmp;
16+ unsigned char *tmp;
17
17
18 new_used = b->used + size;
18 new_used = b->used + size;
19− for (new_size = b->size || 8; new_size < new_used; new_size *= 2);
19+ for (new_size = 1; new_size < new_used; new_size *= 2);
20
20
21 if (new_size != b->size) {
21 if (new_size != b->size) {
22 tmp = realloc(b->buff, new_size);
22 tmp = realloc(b->buff, new_size);
@@ -46,12 +46,12 @@ void my_emitter_set_output(yaml_emitter_t *e, buffer_t *b)
46 yaml_emitter_set_output(e, buffer_append, b);
46 yaml_emitter_set_output(e, buffer_append, b);
47}
47}
48
48
49−unsigned char const * get_parser_error_problem(yaml_parser_t *p)
49+char const * get_parser_error_problem(yaml_parser_t *p)
50{
50{
51 return p->problem;
51 return p->problem;
52}
52}
53
53
54−unsigned char const * get_parser_error_context(yaml_parser_t *p)
54+char const * get_parser_error_context(yaml_parser_t *p)
55{
55{
56 return p->context;
56 return p->context;
57}
57}
@@ -71,7 +71,7 @@ unsigned int get_parser_error_column(yaml_parser_t *p)
71 return p->problem_mark.column;
71 return p->problem_mark.column;
72}
72}
73
73
74−unsigned char const * get_emitter_error(yaml_emitter_t *e)
74+char const * get_emitter_error(yaml_emitter_t *e)
75{
75{
76 return e->problem;
76 return e->problem;
77}
77}
@@ -104,13 +104,13 @@ unsigned long get_scalar_length(yaml_event_t *e)
104unsigned char * get_scalar_tag(yaml_event_t *e)
104unsigned char * get_scalar_tag(yaml_event_t *e)
105{
105{
106 unsigned char *s = e->data.scalar.tag;
106 unsigned char *s = e->data.scalar.tag;
107− if (!s) s = "";
107+ if (!s) s = (unsigned char *) "";
108 return s;
108 return s;
109}
109}
110
110
111unsigned long get_scalar_tag_len(yaml_event_t *e)
111unsigned long get_scalar_tag_len(yaml_event_t *e)
112{
112{
113− return strlen(get_scalar_tag(e));
113+ return strlen((char *) get_scalar_tag(e));
114}
114}
115
115
116int get_scalar_style(yaml_event_t *e)
116int get_scalar_style(yaml_event_t *e)
@@ -143,6 +143,7 @@ int yaml_parser_set_input_filename(yaml_parser_t *parser, const char *filename)
143 FILE *in = fopen(filename, "r");
143 FILE *in = fopen(filename, "r");
144 if (!in) return 0;
144 if (!in) return 0;
145 yaml_parser_set_input_file(parser, in);
145 yaml_parser_set_input_file(parser, in);
146+ return 1;
146}
147}
147
148
148int fclose_helper(FILE *file)
149int fclose_helper(FILE *file)
c/helper.h+3−3
@@ -14,11 +14,11 @@ unsigned int get_buffer_used(buffer_t *b);
14
14
15void my_emitter_set_output(yaml_emitter_t *e, buffer_t *b);
15void my_emitter_set_output(yaml_emitter_t *e, buffer_t *b);
16
16
17−unsigned char const * get_parser_error_problem(yaml_parser_t *p);
17+char const * get_parser_error_problem(yaml_parser_t *p);
18−unsigned char const * get_parser_error_context(yaml_parser_t *p);
18+char const * get_parser_error_context(yaml_parser_t *p);
19unsigned int get_parser_error_offset(yaml_parser_t *p);
19unsigned int get_parser_error_offset(yaml_parser_t *p);
20
20
21−unsigned char const * get_emitter_error(yaml_emitter_t *e);
21+char const * get_emitter_error(yaml_emitter_t *e);
22
22
23int simple_document_start(yaml_event_t *e);
23int simple_document_start(yaml_event_t *e);
24
24