3rd-party/libfort
1
0
Fork 0
Code Releases Activity

[F] Fixed logic errors

Browse Source
This commit is contained in:
seleznevae 2019-01-02 09:42:32 +03:00
parent 1070eebf97
commit fee7ed20ba
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/fort.c
View File

@ -338,7 +338,7 @@ FT_INTERNAL
void destroy_string_buffer(string_buffer_t *buffer); void destroy_string_buffer(string_buffer_t *buffer);
FT_INTERNAL FT_INTERNAL
string_buffer_t *copy_string_buffer(string_buffer_t *buffer); string_buffer_t *copy_string_buffer(const string_buffer_t *buffer);
FT_INTERNAL FT_INTERNAL
fort_status_t realloc_string_buffer_without_copy(string_buffer_t *buffer); fort_status_t realloc_string_buffer_without_copy(string_buffer_t *buffer);
@ -352,7 +352,7 @@ fort_status_t fill_buffer_from_wstring(string_buffer_t *buffer, const wchar_t *s
#endif /* FT_HAVE_WCHAR */ #endif /* FT_HAVE_WCHAR */
FT_INTERNAL FT_INTERNAL
size_t buffer_text_height(string_buffer_t *buffer); size_t buffer_text_height(const string_buffer_t *buffer);
FT_INTERNAL FT_INTERNAL
size_t string_buffer_capacity(const string_buffer_t *buffer); size_t string_buffer_capacity(const string_buffer_t *buffer);
@ -4846,7 +4846,7 @@ void destroy_string_buffer(string_buffer_t *buffer)
} }
FT_INTERNAL FT_INTERNAL
string_buffer_t *copy_string_buffer(string_buffer_t *buffer) string_buffer_t *copy_string_buffer(const string_buffer_t *buffer)
{ {
assert(buffer); assert(buffer);
string_buffer_t *result = create_string_buffer(buffer->data_sz, buffer->type); string_buffer_t *result = create_string_buffer(buffer->data_sz, buffer->type);
@ -4855,14 +4855,14 @@ string_buffer_t *copy_string_buffer(string_buffer_t *buffer)
switch (buffer->type) { switch (buffer->type) {
case CharBuf: case CharBuf:
if (FT_IS_ERROR(fill_buffer_from_string(result, buffer->str.cstr))) { if (FT_IS_ERROR(fill_buffer_from_string(result, buffer->str.cstr))) {
destroy_string_buffer(buffer); destroy_string_buffer(result);
return NULL; return NULL;
} }
break; break;
#ifdef FT_HAVE_WCHAR #ifdef FT_HAVE_WCHAR
case WCharBuf: case WCharBuf:
if (FT_IS_ERROR(fill_buffer_from_wstring(result, buffer->str.wstr))) { if (FT_IS_ERROR(fill_buffer_from_wstring(result, buffer->str.wstr))) {
destroy_string_buffer(buffer); destroy_string_buffer(result);
return NULL; return NULL;
} }
break; break;
@ -4928,7 +4928,7 @@ fort_status_t fill_buffer_from_wstring(string_buffer_t *buffer, const wchar_t *s
FT_INTERNAL FT_INTERNAL
size_t buffer_text_height(string_buffer_t *buffer) size_t buffer_text_height(const string_buffer_t *buffer)
{ {
if (buffer == NULL || buffer->str.data == NULL || buf_str_len(buffer) == 0) { if (buffer == NULL || buffer->str.data == NULL || buf_str_len(buffer) == 0) {
return 0; return 0;

8
src/string_buffer.c
View File

@ -195,7 +195,7 @@ void destroy_string_buffer(string_buffer_t *buffer)
} }
FT_INTERNAL FT_INTERNAL
string_buffer_t *copy_string_buffer(string_buffer_t *buffer) string_buffer_t *copy_string_buffer(const string_buffer_t *buffer)
{ {
assert(buffer); assert(buffer);
string_buffer_t *result = create_string_buffer(buffer->data_sz, buffer->type); string_buffer_t *result = create_string_buffer(buffer->data_sz, buffer->type);
@ -204,14 +204,14 @@ string_buffer_t *copy_string_buffer(string_buffer_t *buffer)
switch (buffer->type) { switch (buffer->type) {
case CharBuf: case CharBuf:
if (FT_IS_ERROR(fill_buffer_from_string(result, buffer->str.cstr))) { if (FT_IS_ERROR(fill_buffer_from_string(result, buffer->str.cstr))) {
destroy_string_buffer(buffer); destroy_string_buffer(result);
return NULL; return NULL;
} }
break; break;
#ifdef FT_HAVE_WCHAR #ifdef FT_HAVE_WCHAR
case WCharBuf: case WCharBuf:
if (FT_IS_ERROR(fill_buffer_from_wstring(result, buffer->str.wstr))) { if (FT_IS_ERROR(fill_buffer_from_wstring(result, buffer->str.wstr))) {
destroy_string_buffer(buffer); destroy_string_buffer(result);
return NULL; return NULL;
} }
break; break;
@ -277,7 +277,7 @@ fort_status_t fill_buffer_from_wstring(string_buffer_t *buffer, const wchar_t *s
FT_INTERNAL FT_INTERNAL
size_t buffer_text_height(string_buffer_t *buffer) size_t buffer_text_height(const string_buffer_t *buffer)
{ {
if (buffer == NULL || buffer->str.data == NULL || buf_str_len(buffer) == 0) { if (buffer == NULL || buffer->str.data == NULL || buf_str_len(buffer) == 0) {
return 0; return 0;

4
src/string_buffer.h
View File

@ -31,7 +31,7 @@ FT_INTERNAL
void destroy_string_buffer(string_buffer_t *buffer); void destroy_string_buffer(string_buffer_t *buffer);
FT_INTERNAL FT_INTERNAL
string_buffer_t *copy_string_buffer(string_buffer_t *buffer); string_buffer_t *copy_string_buffer(const string_buffer_t *buffer);
FT_INTERNAL FT_INTERNAL
fort_status_t realloc_string_buffer_without_copy(string_buffer_t *buffer); fort_status_t realloc_string_buffer_without_copy(string_buffer_t *buffer);
@ -45,7 +45,7 @@ fort_status_t fill_buffer_from_wstring(string_buffer_t *buffer, const wchar_t *s
#endif /* FT_HAVE_WCHAR */ #endif /* FT_HAVE_WCHAR */
FT_INTERNAL FT_INTERNAL
size_t buffer_text_height(string_buffer_t *buffer); size_t buffer_text_height(const string_buffer_t *buffer);
FT_INTERNAL FT_INTERNAL
size_t string_buffer_capacity(const string_buffer_t *buffer); size_t string_buffer_capacity(const string_buffer_t *buffer);