diff options
author | Campbell Barton <ideasman42@gmail.com> | 2019-03-27 05:16:10 +0300 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2019-03-27 05:17:30 +0300 |
commit | 9ba948a4859da3308033fa6dc54f74433d7e6a21 (patch) | |
tree | 0bd6e95eb59d9af03aa32d925c68e1cbebecc246 /source/blender/blenlib/intern/BLI_dynstr.c | |
parent | 337eb8c1de4c57c34520b467d79779153335eecb (diff) |
Cleanup: style, use braces for blenlib
Diffstat (limited to 'source/blender/blenlib/intern/BLI_dynstr.c')
-rw-r--r-- | source/blender/blenlib/intern/BLI_dynstr.c | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/source/blender/blenlib/intern/BLI_dynstr.c b/source/blender/blenlib/intern/BLI_dynstr.c index 98682101c65..ef45d7b2a47 100644 --- a/source/blender/blenlib/intern/BLI_dynstr.c +++ b/source/blender/blenlib/intern/BLI_dynstr.c @@ -112,10 +112,12 @@ void BLI_dynstr_append(DynStr *__restrict ds, const char *cstr) memcpy(dse->str, cstr, cstrlen + 1); dse->next = NULL; - if (!ds->last) + if (!ds->last) { ds->last = ds->elems = dse; - else + } + else { ds->last = ds->last->next = dse; + } ds->curlen += cstrlen; } @@ -137,10 +139,12 @@ void BLI_dynstr_nappend(DynStr *__restrict ds, const char *cstr, int len) dse->str[cstrlen] = '\0'; dse->next = NULL; - if (!ds->last) + if (!ds->last) { ds->last = ds->elems = dse; - else + } + else { ds->last = ds->last->next = dse; + } ds->curlen += cstrlen; } @@ -154,10 +158,12 @@ void BLI_dynstr_vappendf(DynStr *__restrict ds, const char *__restrict format, v while (1) { va_list args_cpy; - if (len == sizeof(fixedmessage)) + if (len == sizeof(fixedmessage)) { message = fixedmessage; - else + } + else { message = MEM_callocN(sizeof(char) * len, "BLI_dynstr_appendf"); + } /* cant reuse the same args, so work on a copy */ va_copy(args_cpy, args); @@ -167,8 +173,9 @@ void BLI_dynstr_vappendf(DynStr *__restrict ds, const char *__restrict format, v if (retval == -1) { /* -1 means not enough space, but on windows it may also mean * there is a formatting error, so we impose a maximum length */ - if (message != fixedmessage) + if (message != fixedmessage) { MEM_freeN(message); + } message = NULL; len *= 2; @@ -179,22 +186,25 @@ void BLI_dynstr_vappendf(DynStr *__restrict ds, const char *__restrict format, v } else if (retval >= len) { /* in C99 the actual length required is returned */ - if (message != fixedmessage) + if (message != fixedmessage) { MEM_freeN(message); + } message = NULL; /* retval doesn't include \0 terminator */ len = retval + 1; } - else + else { break; + } } if (message) { BLI_dynstr_append(ds, message); - if (message != fixedmessage) + if (message != fixedmessage) { MEM_freeN(message); + } } } @@ -217,10 +227,12 @@ void BLI_dynstr_appendf(DynStr *__restrict ds, const char *__restrict format, .. * va_start/va_end have to be called for each vsnprintf call */ while (1) { - if (len == sizeof(fixedmessage)) + if (len == sizeof(fixedmessage)) { message = fixedmessage; - else + } + else { message = MEM_callocN(sizeof(char) * (len), "BLI_dynstr_appendf"); + } va_start(args, format); retval = vsnprintf(message, len, format, args); @@ -229,8 +241,9 @@ void BLI_dynstr_appendf(DynStr *__restrict ds, const char *__restrict format, .. if (retval == -1) { /* -1 means not enough space, but on windows it may also mean * there is a formatting error, so we impose a maximum length */ - if (message != fixedmessage) + if (message != fixedmessage) { MEM_freeN(message); + } message = NULL; len *= 2; @@ -241,22 +254,25 @@ void BLI_dynstr_appendf(DynStr *__restrict ds, const char *__restrict format, .. } else if (retval >= len) { /* in C99 the actual length required is returned */ - if (message != fixedmessage) + if (message != fixedmessage) { MEM_freeN(message); + } message = NULL; /* retval doesn't include \0 terminator */ len = retval + 1; } - else + else { break; + } } if (message) { BLI_dynstr_append(ds, message); - if (message != fixedmessage) + if (message != fixedmessage) { MEM_freeN(message); + } } } |