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

Removing EXPORT statements from all source files and most header files, leaving only the exports for the main API in libpostal.h. Modified Makefiles so that all the test apps build without having extra functions exported from libpostal.

Browse Source
This commit is contained in:
AeroXuk
2017-11-25 04:35:28 +00:00
parent f0246e7333
commit 26ac9ab5c2
26 changed files with 186 additions and 211 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/string_utils.c
View File

@@ -58,7 +58,7 @@ inline size_t string_common_suffix(const char *str1, const char *str2) {
return common_suffix;
}
LIBPOSTAL_EXPORT inline bool string_starts_with(const char *str, const char *start) {
inline bool string_starts_with(const char *str, const char *start) {
for (; *start; str++, start++)
if (*str != *start)
return false;
@@ -72,7 +72,7 @@ inline bool string_ends_with(const char *str, const char *ending) {
return str_len < end_len ? false : !strcmp(str + str_len - end_len, ending);
}
LIBPOSTAL_EXPORT inline bool string_equals(const char *s1, const char *s2) {
inline bool string_equals(const char *s1, const char *s2) {
if (s1 == NULL || s2 == NULL) return false;
return strcmp(s1, s2) == 0;
}
@@ -169,7 +169,7 @@ uint32_t string_translate(char *str, size_t len, char *word_chars, char *word_re
return num_replacements;
}
LIBPOSTAL_EXPORT ssize_t utf8proc_iterate_reversed(const uint8_t *str, ssize_t start, int32_t *dst) {
ssize_t utf8proc_iterate_reversed(const uint8_t *str, ssize_t start, int32_t *dst) {
ssize_t len = 0;
const uint8_t *ptr = str + start;
@@ -188,7 +188,7 @@ LIBPOSTAL_EXPORT ssize_t utf8proc_iterate_reversed(const uint8_t *str, ssize_t s
return ret_len;
}
LIBPOSTAL_EXPORT char *utf8_reversed_string(const char *s) {
char *utf8_reversed_string(const char *s) {
int32_t unich;
ssize_t len, remaining;
@@ -478,7 +478,7 @@ size_t utf8_common_prefix_len_ignore_separators(const char *str1, const char *st
}
LIBPOSTAL_EXPORT inline size_t utf8_common_prefix_ignore_separators(const char *str1, const char *str2) {
inline size_t utf8_common_prefix_ignore_separators(const char *str1, const char *str2) {
return utf8_common_prefix_len_ignore_separators(str1, str2, strlen(str2));
}
@@ -606,7 +606,7 @@ size_t string_left_spaces_len(char *str, size_t len) {
return spaces;
}
LIBPOSTAL_EXPORT char *string_trim(char *str) {
char *string_trim(char *str) {
size_t len = strlen(str);
size_t left_spaces = string_left_spaces_len(str, len);
size_t right_spaces = string_right_spaces_len(str, len);
@@ -630,14 +630,14 @@ char_array *char_array_from_string_no_copy(char *str, size_t n) {
return array;
}
LIBPOSTAL_EXPORT inline char *char_array_get_string(char_array *array) {
inline char *char_array_get_string(char_array *array) {
if (array->n == 0 || array->a[array->n - 1] != '\0') {
char_array_terminate(array);
}
return array->a;
}
LIBPOSTAL_EXPORT inline char *char_array_to_string(char_array *array) {
inline char *char_array_to_string(char_array *array) {
if (array->n == 0 || array->a[array->n - 1] != '\0') {
char_array_terminate(array);
}
@@ -662,7 +662,7 @@ inline size_t char_array_len(char_array *array) {
}
}
LIBPOSTAL_EXPORT inline void char_array_append(char_array *array, char *str) {
inline void char_array_append(char_array *array, char *str) {
while(*str) {
char_array_push(array, *str++);
}
@@ -696,11 +696,11 @@ inline void char_array_append_reversed(char_array *array, char *str) {
char_array_append_reversed_len(array, str, len);
}
LIBPOSTAL_EXPORT inline void char_array_terminate(char_array *array) {
inline void char_array_terminate(char_array *array) {
char_array_push(array, '\0');
}
LIBPOSTAL_EXPORT inline void char_array_cat(char_array *array, char *str) {
inline void char_array_cat(char_array *array, char *str) {
char_array_strip_nul_byte(array);
char_array_append(array, str);
char_array_terminate(array);
@@ -713,7 +713,7 @@ inline void char_array_cat_len(char_array *array, char *str, size_t len) {
}
LIBPOSTAL_EXPORT inline void char_array_cat_reversed(char_array *array, char *str) {
inline void char_array_cat_reversed(char_array *array, char *str) {
char_array_strip_nul_byte(array);
char_array_append_reversed(array, str);
char_array_terminate(array);
@@ -764,7 +764,7 @@ void char_array_add_vjoined(char_array *array, char *separator, bool strip_separ
}
LIBPOSTAL_EXPORT inline void char_array_add_joined(char_array *array, char *separator, bool strip_separator, int count, ...) {
inline void char_array_add_joined(char_array *array, char *separator, bool strip_separator, int count, ...) {
va_list args;
va_start(args, count);
char_array_add_vjoined(array, separator, strip_separator, count, args);
@@ -808,14 +808,14 @@ void char_array_cat_vprintf(char_array *array, char *format, va_list args) {
}
}
LIBPOSTAL_EXPORT void char_array_cat_printf(char_array *array, char *format, ...) {
void char_array_cat_printf(char_array *array, char *format, ...) {
va_list args;
va_start(args, format);
char_array_cat_vprintf(array, format, args);
va_end(args);
}
LIBPOSTAL_EXPORT cstring_array *cstring_array_new(void) {
cstring_array *cstring_array_new(void) {
cstring_array *array = malloc(sizeof(cstring_array));
if (array == NULL) return NULL;
@@ -834,7 +834,7 @@ LIBPOSTAL_EXPORT cstring_array *cstring_array_new(void) {
return array;
}
LIBPOSTAL_EXPORT void cstring_array_destroy(cstring_array *self) {
void cstring_array_destroy(cstring_array *self) {
if (self == NULL) return;
if (self->indices) {
uint32_array_destroy(self->indices);
@@ -889,7 +889,7 @@ inline size_t cstring_array_used(cstring_array *self) {
return self->str->n;
}
LIBPOSTAL_EXPORT inline size_t cstring_array_num_strings(cstring_array *self) {
inline size_t cstring_array_num_strings(cstring_array *self) {
if (self == NULL) return 0;
return self->indices->n;
}
@@ -958,13 +958,13 @@ inline int32_t cstring_array_get_offset(cstring_array *self, uint32_t i) {
return (int32_t)self->indices->a[i];
}
LIBPOSTAL_EXPORT inline char *cstring_array_get_string(cstring_array *self, uint32_t i) {
inline char *cstring_array_get_string(cstring_array *self, uint32_t i) {
int32_t data_index = cstring_array_get_offset(self, i);
if (data_index < 0) return NULL;
return self->str->a + data_index;
}
LIBPOSTAL_EXPORT inline int64_t cstring_array_token_length(cstring_array *self, uint32_t i) {
inline int64_t cstring_array_token_length(cstring_array *self, uint32_t i) {
if (INVALID_INDEX(i, self->indices->n)) {
return -1;
}
@@ -1015,7 +1015,7 @@ cstring_array *cstring_array_split_ignore_consecutive(char *str, const char *sep
}
LIBPOSTAL_EXPORT cstring_array *cstring_array_split_no_copy(char *str, char separator, size_t *count) {
cstring_array *cstring_array_split_no_copy(char *str, char separator, size_t *count) {
*count = 0;
char *ptr = str;
size_t len = strlen(str);
@@ -1034,7 +1034,7 @@ LIBPOSTAL_EXPORT cstring_array *cstring_array_split_no_copy(char *str, char sepa
}
LIBPOSTAL_EXPORT char **cstring_array_to_strings(cstring_array *self) {
char **cstring_array_to_strings(cstring_array *self) {
char **strings = malloc(self->indices->n * sizeof(char *));
for (int i = 0; i < cstring_array_num_strings(self); i++) {
@@ -1073,7 +1073,7 @@ string_tree_t *string_tree_new_size(size_t size) {
#define DEFAULT_STRING_TREE_SIZE 8
LIBPOSTAL_EXPORT string_tree_t *string_tree_new(void) {
string_tree_t *string_tree_new(void) {
return string_tree_new_size((size_t)DEFAULT_STRING_TREE_SIZE);
}
@@ -1085,12 +1085,12 @@ inline char *string_tree_get_alternative(string_tree_t *self, size_t token_index
return cstring_array_get_string(self->strings, token_start + alternative);
}
LIBPOSTAL_EXPORT inline void string_tree_finalize_token(string_tree_t *self) {
inline void string_tree_finalize_token(string_tree_t *self) {
uint32_array_push(self->token_indices, (uint32_t)cstring_array_num_strings(self->strings));
}
// terminated
LIBPOSTAL_EXPORT inline void string_tree_add_string(string_tree_t *self, char *str) {
inline void string_tree_add_string(string_tree_t *self, char *str) {
cstring_array_add_string(self->strings, str);
}
@@ -1115,13 +1115,13 @@ inline uint32_t string_tree_num_strings(string_tree_t *self) {
return (uint32_t)cstring_array_num_strings(self->strings);
}
LIBPOSTAL_EXPORT inline uint32_t string_tree_num_alternatives(string_tree_t *self, uint32_t i) {
inline uint32_t string_tree_num_alternatives(string_tree_t *self, uint32_t i) {
if (i >= self->token_indices->n) return 0;
uint32_t n = self->token_indices->a[i + 1] - self->token_indices->a[i];
return n > 0 ? n : 1;
}
LIBPOSTAL_EXPORT void string_tree_destroy(string_tree_t *self) {
void string_tree_destroy(string_tree_t *self) {
if (self == NULL) return;
if (self->token_indices != NULL) {
@@ -1135,7 +1135,7 @@ LIBPOSTAL_EXPORT void string_tree_destroy(string_tree_t *self) {
free(self);
}
LIBPOSTAL_EXPORT string_tree_iterator_t *string_tree_iterator_new(string_tree_t *tree) {
string_tree_iterator_t *string_tree_iterator_new(string_tree_t *tree) {
string_tree_iterator_t *self = malloc(sizeof(string_tree_iterator_t));
self->tree = tree;
@@ -1166,7 +1166,7 @@ LIBPOSTAL_EXPORT string_tree_iterator_t *string_tree_iterator_new(string_tree_t
return self;
}
LIBPOSTAL_EXPORT void string_tree_iterator_next(string_tree_iterator_t *self) {
void string_tree_iterator_next(string_tree_iterator_t *self) {
if (self->remaining > 0) {
int i;
for (i = self->num_tokens - 1; i >= 0; i--) {
@@ -1195,11 +1195,11 @@ char *string_tree_iterator_get_string(string_tree_iterator_t *self, uint32_t i)
return cstring_array_get_string(self->tree->strings, base_index + offset);
}
LIBPOSTAL_EXPORT bool string_tree_iterator_done(string_tree_iterator_t *self) {
bool string_tree_iterator_done(string_tree_iterator_t *self) {
return self->remaining == 0;
}
LIBPOSTAL_EXPORT void string_tree_iterator_destroy(string_tree_iterator_t *self) {
void string_tree_iterator_destroy(string_tree_iterator_t *self) {
if (self == NULL) return;
if (self->path) {