diff options
| -rw-r--r-- | csv.c | 21 |
1 files changed, 10 insertions, 11 deletions
| @@ -4,7 +4,6 @@ | |||
| 4 | #include <string.h> | 4 | #include <string.h> |
| 5 | #include "csv.h" | 5 | #include "csv.h" |
| 6 | 6 | ||
| 7 | #define INLINE static inline | ||
| 8 | 7 | ||
| 9 | /* === CSV-MEMORY Interface === */ | 8 | /* === CSV-MEMORY Interface === */ |
| 10 | 9 | ||
| @@ -46,7 +45,7 @@ const csv_options_t csv_default_options = { | |||
| 46 | 45 | ||
| 47 | /* === CSV-ERROR Interface === */ | 46 | /* === CSV-ERROR Interface === */ |
| 48 | 47 | ||
| 49 | INLINE void | 48 | static void |
| 50 | csv_fatal_error(csv_err_t csv_err, const csv_options_t * const csv_options) | 49 | csv_fatal_error(csv_err_t csv_err, const csv_options_t * const csv_options) |
| 51 | { | 50 | { |
| 52 | if ( csv_options->cb_error != NULL ) { | 51 | if ( csv_options->cb_error != NULL ) { |
| @@ -59,7 +58,7 @@ csv_fatal_error(csv_err_t csv_err, const csv_options_t * const csv_options) | |||
| 59 | 58 | ||
| 60 | /* === CSV-STRING Interface === */ | 59 | /* === CSV-STRING Interface === */ |
| 61 | 60 | ||
| 62 | INLINE void | 61 | static void |
| 63 | csv_string_init(csv_string_t *csv_string) | 62 | csv_string_init(csv_string_t *csv_string) |
| 64 | { | 63 | { |
| 65 | assert(csv_string != NULL); | 64 | assert(csv_string != NULL); |
| @@ -69,7 +68,7 @@ csv_string_init(csv_string_t *csv_string) | |||
| 69 | csv_string->pos = 0; | 68 | csv_string->pos = 0; |
| 70 | } | 69 | } |
| 71 | 70 | ||
| 72 | INLINE void | 71 | static void |
| 73 | csv_string_reset(csv_string_t *csv_string) | 72 | csv_string_reset(csv_string_t *csv_string) |
| 74 | { | 73 | { |
| 75 | assert(csv_string != NULL); | 74 | assert(csv_string != NULL); |
| @@ -77,7 +76,7 @@ csv_string_reset(csv_string_t *csv_string) | |||
| 77 | csv_string->pos = 0; | 76 | csv_string->pos = 0; |
| 78 | } | 77 | } |
| 79 | 78 | ||
| 80 | INLINE int | 79 | static int |
| 81 | csv_string_empty(csv_string_t *csv_string) | 80 | csv_string_empty(csv_string_t *csv_string) |
| 82 | { | 81 | { |
| 83 | assert(csv_string != NULL); | 82 | assert(csv_string != NULL); |
| @@ -85,7 +84,7 @@ csv_string_empty(csv_string_t *csv_string) | |||
| 85 | return ( csv_string->pos == 0 ) ? 1 : 0; | 84 | return ( csv_string->pos == 0 ) ? 1 : 0; |
| 86 | } | 85 | } |
| 87 | 86 | ||
| 88 | INLINE void | 87 | static void |
| 89 | csv_string_append(csv_string_t *csv_string, char ch, const csv_options_t * const csv_options) | 88 | csv_string_append(csv_string_t *csv_string, char ch, const csv_options_t * const csv_options) |
| 90 | { | 89 | { |
| 91 | assert(csv_string != NULL); | 90 | assert(csv_string != NULL); |
| @@ -117,7 +116,7 @@ csv_string_append(csv_string_t *csv_string, char ch, const csv_options_t * const | |||
| 117 | csv_string->str[csv_string->pos++] = ch; /* append char */ | 116 | csv_string->str[csv_string->pos++] = ch; /* append char */ |
| 118 | } | 117 | } |
| 119 | 118 | ||
| 120 | INLINE void | 119 | static void |
| 121 | csv_string_free(csv_string_t *csv_string, const csv_options_t * const csv_options) | 120 | csv_string_free(csv_string_t *csv_string, const csv_options_t * const csv_options) |
| 122 | { | 121 | { |
| 123 | assert(csv_string != NULL); | 122 | assert(csv_string != NULL); |
| @@ -131,7 +130,7 @@ csv_string_free(csv_string_t *csv_string, const csv_options_t * const csv_option | |||
| 131 | 130 | ||
| 132 | /* === CSV-FIELD Interface === */ | 131 | /* === CSV-FIELD Interface === */ |
| 133 | 132 | ||
| 134 | INLINE void | 133 | static void |
| 135 | csv_field_init(csv_field_t *csv_field) | 134 | csv_field_init(csv_field_t *csv_field) |
| 136 | { | 135 | { |
| 137 | assert(csv_field != NULL); | 136 | assert(csv_field != NULL); |
| @@ -141,7 +140,7 @@ csv_field_init(csv_field_t *csv_field) | |||
| 141 | csv_field->pos = 0; | 140 | csv_field->pos = 0; |
| 142 | } | 141 | } |
| 143 | 142 | ||
| 144 | INLINE void | 143 | static void |
| 145 | csv_field_reset(csv_field_t *csv_field) | 144 | csv_field_reset(csv_field_t *csv_field) |
| 146 | { | 145 | { |
| 147 | assert(csv_field != NULL); | 146 | assert(csv_field != NULL); |
| @@ -149,7 +148,7 @@ csv_field_reset(csv_field_t *csv_field) | |||
| 149 | csv_field->pos = 0; | 148 | csv_field->pos = 0; |
| 150 | } | 149 | } |
| 151 | 150 | ||
| 152 | INLINE void | 151 | static void |
| 153 | csv_field_append(csv_field_t *csv_field, int idx, const csv_options_t * const csv_options) | 152 | csv_field_append(csv_field_t *csv_field, int idx, const csv_options_t * const csv_options) |
| 154 | { | 153 | { |
| 155 | assert(csv_field != NULL); | 154 | assert(csv_field != NULL); |
| @@ -181,7 +180,7 @@ csv_field_append(csv_field_t *csv_field, int idx, const csv_options_t * const cs | |||
| 181 | csv_field->fields[csv_field->pos++] = idx; /* append idx */ | 180 | csv_field->fields[csv_field->pos++] = idx; /* append idx */ |
| 182 | } | 181 | } |
| 183 | 182 | ||
| 184 | INLINE void | 183 | static void |
| 185 | csv_field_free(csv_field_t *csv_field, const csv_options_t * const csv_options) | 184 | csv_field_free(csv_field_t *csv_field, const csv_options_t * const csv_options) |
| 186 | { | 185 | { |
| 187 | assert(csv_field != NULL); | 186 | assert(csv_field != NULL); |
