tommy/libpostal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[fix] Moving address_parser_response_destroy into libpostal so caller can free

Browse Source
This commit is contained in:
Al
2015-12-15 00:52:24 -05:00
parent ab3ba249d7
commit b9bf5c629e
4 changed files with 30 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/address_parser.c
View File

@@ -801,31 +801,6 @@ address_parser_response_t *address_parser_response_new(void) {
return response;
}
void address_parser_response_destroy(address_parser_response_t *self) {
if (self == NULL) return;
for (int i = 0; i < self->num_components; i++) {
if (self->components != NULL) {
free(self->components[i]);
}
if (self->labels != NULL) {
free(self->labels[i]);
}
}
if (self->components != NULL) {
free(self->components);
}
if (self->labels != NULL) {
free(self->labels);
}
free(self);
}
address_parser_response_t *address_parser_parse(char *address, char *language, char *country, address_parser_context_t *context) {
if (address == NULL || context == NULL) return NULL;

1
src/address_parser.h
View File

@@ -139,7 +139,6 @@ address_parser_t *address_parser_new(void);
address_parser_t *get_address_parser(void);
bool address_parser_load(char *dir);
void address_parser_response_destroy(address_parser_response_t *self);
address_parser_response_t *address_parser_parse(char *address, char *language, char *country, address_parser_context_t *context);
void address_parser_destroy(address_parser_t *self);

26
src/libpostal.c
View File

@@ -822,6 +822,32 @@ char **expand_address(char *input, normalize_options_t options, size_t *n) {
}
void address_parser_response_destroy(address_parser_response_t *self) {
if (self == NULL) return;
for (int i = 0; i < self->num_components; i++) {
if (self->components != NULL) {
free(self->components[i]);
}
if (self->labels != NULL) {
free(self->labels[i]);
}
}
if (self->components != NULL) {
free(self->components);
}
if (self->labels != NULL) {
free(self->labels);
}
free(self);
}
address_parser_response_t *parse_address(char *address, address_parser_options_t options) {
address_parser_context_t *context = address_parser_context_new();
address_parser_response_t *parsed = address_parser_parse(address, options.language, options.country, context);

4
src/libpostal.h
View File

@@ -107,8 +107,12 @@ static address_parser_options_t LIBPOSTAL_ADDRESS_PARSER_DEFAULT_OPTIONS = {
.country = NULL
};
void address_parser_response_destroy(address_parser_response_t *self);
address_parser_response_t *parse_address(char *address, address_parser_options_t options);
// Setup/teardown methods