diff options
author | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 13:39:50 +0300 |
---|---|---|
committer | Sybren A. Stüvel <sybren@blender.org> | 2020-08-07 14:38:06 +0300 |
commit | dbf4f52fe0b7644ab607a6edd66facc6f1736693 (patch) | |
tree | 51d003842c620ddeb7258ebd863fd60eed972e7d /source/blender/imbuf/intern/cineon/logmemfile.c | |
parent | c889d93c80c52603a501b6b76f6e251b7a6112d2 (diff) |
Cleanup: ImBuf, Clang-Tidy else-after-return fixes
This addresses warnings from Clang-Tidy's `readability-else-after-return`
rule in the `source/blender/imbuf` module.
No functional changes.
Diffstat (limited to 'source/blender/imbuf/intern/cineon/logmemfile.c')
-rw-r--r-- | source/blender/imbuf/intern/cineon/logmemfile.c | 36 |
1 files changed, 17 insertions, 19 deletions
diff --git a/source/blender/imbuf/intern/cineon/logmemfile.c b/source/blender/imbuf/intern/cineon/logmemfile.c index 91351d309de..aca84df91ca 100644 --- a/source/blender/imbuf/intern/cineon/logmemfile.c +++ b/source/blender/imbuf/intern/cineon/logmemfile.c @@ -64,10 +64,9 @@ int logimage_fwrite(void *buffer, size_t size, unsigned int count, LogImageFile if (logFile->file) { return fwrite(buffer, size, count, logFile->file); } - else { /* we're writing to memory */ - /* do nothing as this isn't supported yet */ - return count; - } + /* we're writing to memory */ + /* do nothing as this isn't supported yet */ + return count; } int logimage_fread(void *buffer, size_t size, unsigned int count, LogImageFile *logFile) @@ -75,23 +74,22 @@ int logimage_fread(void *buffer, size_t size, unsigned int count, LogImageFile * if (logFile->file) { return fread(buffer, size, count, logFile->file); } - else { /* we're reading from memory */ - unsigned char *buf = (unsigned char *)buffer; - uintptr_t pos = (uintptr_t)logFile->memCursor - (uintptr_t)logFile->memBuffer; - size_t total_size = size * count; - if (pos + total_size > logFile->memBufferSize) { - /* how many elements can we read without overflow ? */ - count = (logFile->memBufferSize - pos) / size; - /* recompute the size */ - total_size = size * count; - } - - if (total_size != 0) { - memcpy(buf, logFile->memCursor, total_size); - } + /* we're reading from memory */ + unsigned char *buf = (unsigned char *)buffer; + uintptr_t pos = (uintptr_t)logFile->memCursor - (uintptr_t)logFile->memBuffer; + size_t total_size = size * count; + if (pos + total_size > logFile->memBufferSize) { + /* how many elements can we read without overflow ? */ + count = (logFile->memBufferSize - pos) / size; + /* recompute the size */ + total_size = size * count; + } - return count; + if (total_size != 0) { + memcpy(buf, logFile->memCursor, total_size); } + + return count; } int logimage_read_uchar(unsigned char *x, LogImageFile *logFile) |