Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2019-04-17 07:17:24 +0300
committerCampbell Barton <ideasman42@gmail.com>2019-04-17 07:21:24 +0300
commite12c08e8d170b7ca40f204a5b0423c23a9fbc2c1 (patch)
tree8cf3453d12edb177a218ef8009357518ec6cab6a /source/blender/blenloader/intern/undofile.c
parentb3dabc200a4b0399ec6b81f2ff2730d07b44fcaa (diff)
ClangFormat: apply to source, most of intern
Apply clang format as proposed in T53211. For details on usage and instructions for migrating branches without conflicts, see: https://wiki.blender.org/wiki/Tools/ClangFormat
Diffstat (limited to 'source/blender/blenloader/intern/undofile.c')
-rw-r--r--source/blender/blenloader/intern/undofile.c198
1 files changed, 102 insertions, 96 deletions
diff --git a/source/blender/blenloader/intern/undofile.c b/source/blender/blenloader/intern/undofile.c
index ef5d8963be7..0c09aa34a8b 100644
--- a/source/blender/blenloader/intern/undofile.c
+++ b/source/blender/blenloader/intern/undofile.c
@@ -55,88 +55,90 @@
/* not memfile itself */
void BLO_memfile_free(MemFile *memfile)
{
- MemFileChunk *chunk;
-
- while ((chunk = BLI_pophead(&memfile->chunks))) {
- if (chunk->is_identical == false) {
- MEM_freeN((void *)chunk->buf);
- }
- MEM_freeN(chunk);
- }
- memfile->size = 0;
+ MemFileChunk *chunk;
+
+ while ((chunk = BLI_pophead(&memfile->chunks))) {
+ if (chunk->is_identical == false) {
+ MEM_freeN((void *)chunk->buf);
+ }
+ MEM_freeN(chunk);
+ }
+ memfile->size = 0;
}
/* to keep list of memfiles consistent, 'first' is always first in list */
/* result is that 'first' is being freed */
void BLO_memfile_merge(MemFile *first, MemFile *second)
{
- MemFileChunk *fc, *sc;
-
- fc = first->chunks.first;
- sc = second->chunks.first;
- while (fc || sc) {
- if (fc && sc) {
- if (sc->is_identical) {
- sc->is_identical = false;
- fc->is_identical = true;
- }
- }
- if (fc) fc = fc->next;
- if (sc) sc = sc->next;
- }
-
- BLO_memfile_free(first);
+ MemFileChunk *fc, *sc;
+
+ fc = first->chunks.first;
+ sc = second->chunks.first;
+ while (fc || sc) {
+ if (fc && sc) {
+ if (sc->is_identical) {
+ sc->is_identical = false;
+ fc->is_identical = true;
+ }
+ }
+ if (fc)
+ fc = fc->next;
+ if (sc)
+ sc = sc->next;
+ }
+
+ BLO_memfile_free(first);
}
-void memfile_chunk_add(
- MemFile *memfile, const char *buf, uint size,
- MemFileChunk **compchunk_step)
+void memfile_chunk_add(MemFile *memfile, const char *buf, uint size, MemFileChunk **compchunk_step)
{
- MemFileChunk *curchunk = MEM_mallocN(sizeof(MemFileChunk), "MemFileChunk");
- curchunk->size = size;
- curchunk->buf = NULL;
- curchunk->is_identical = false;
- BLI_addtail(&memfile->chunks, curchunk);
-
- /* we compare compchunk with buf */
- if (*compchunk_step != NULL) {
- MemFileChunk *compchunk = *compchunk_step;
- if (compchunk->size == curchunk->size) {
- if (memcmp(compchunk->buf, buf, size) == 0) {
- curchunk->buf = compchunk->buf;
- curchunk->is_identical = true;
- }
- }
- *compchunk_step = compchunk->next;
- }
-
- /* not equal... */
- if (curchunk->buf == NULL) {
- char *buf_new = MEM_mallocN(size, "Chunk buffer");
- memcpy(buf_new, buf, size);
- curchunk->buf = buf_new;
- memfile->size += size;
- }
+ MemFileChunk *curchunk = MEM_mallocN(sizeof(MemFileChunk), "MemFileChunk");
+ curchunk->size = size;
+ curchunk->buf = NULL;
+ curchunk->is_identical = false;
+ BLI_addtail(&memfile->chunks, curchunk);
+
+ /* we compare compchunk with buf */
+ if (*compchunk_step != NULL) {
+ MemFileChunk *compchunk = *compchunk_step;
+ if (compchunk->size == curchunk->size) {
+ if (memcmp(compchunk->buf, buf, size) == 0) {
+ curchunk->buf = compchunk->buf;
+ curchunk->is_identical = true;
+ }
+ }
+ *compchunk_step = compchunk->next;
+ }
+
+ /* not equal... */
+ if (curchunk->buf == NULL) {
+ char *buf_new = MEM_mallocN(size, "Chunk buffer");
+ memcpy(buf_new, buf, size);
+ curchunk->buf = buf_new;
+ memfile->size += size;
+ }
}
-struct Main *BLO_memfile_main_get(struct MemFile *memfile, struct Main *oldmain, struct Scene **r_scene)
+struct Main *BLO_memfile_main_get(struct MemFile *memfile,
+ struct Main *oldmain,
+ struct Scene **r_scene)
{
- struct Main *bmain_undo = NULL;
- BlendFileData *bfd = BLO_read_from_memfile(oldmain, BKE_main_blendfile_path(oldmain), memfile, BLO_READ_SKIP_NONE, NULL);
+ struct Main *bmain_undo = NULL;
+ BlendFileData *bfd = BLO_read_from_memfile(
+ oldmain, BKE_main_blendfile_path(oldmain), memfile, BLO_READ_SKIP_NONE, NULL);
- if (bfd) {
- bmain_undo = bfd->main;
- if (r_scene) {
- *r_scene = bfd->curscene;
- }
+ if (bfd) {
+ bmain_undo = bfd->main;
+ if (r_scene) {
+ *r_scene = bfd->curscene;
+ }
- MEM_freeN(bfd);
- }
+ MEM_freeN(bfd);
+ }
- return bmain_undo;
+ return bmain_undo;
}
-
/**
* Saves .blend using undo buffer.
*
@@ -144,43 +146,47 @@ struct Main *BLO_memfile_main_get(struct MemFile *memfile, struct Main *oldmain,
*/
bool BLO_memfile_write_file(struct MemFile *memfile, const char *filename)
{
- MemFileChunk *chunk;
- int file, oflags;
+ MemFileChunk *chunk;
+ int file, oflags;
- /* note: This is currently used for autosave and 'quit.blend', where _not_ following symlinks is OK,
- * however if this is ever executed explicitly by the user, we may want to allow writing to symlinks.
- */
+ /* note: This is currently used for autosave and 'quit.blend', where _not_ following symlinks is OK,
+ * however if this is ever executed explicitly by the user, we may want to allow writing to symlinks.
+ */
- oflags = O_BINARY | O_WRONLY | O_CREAT | O_TRUNC;
+ oflags = O_BINARY | O_WRONLY | O_CREAT | O_TRUNC;
#ifdef O_NOFOLLOW
- /* use O_NOFOLLOW to avoid writing to a symlink - use 'O_EXCL' (CVE-2008-1103) */
- oflags |= O_NOFOLLOW;
+ /* use O_NOFOLLOW to avoid writing to a symlink - use 'O_EXCL' (CVE-2008-1103) */
+ oflags |= O_NOFOLLOW;
#else
- /* TODO(sergey): How to deal with symlinks on windows? */
+ /* TODO(sergey): How to deal with symlinks on windows? */
# ifndef _MSC_VER
# warning "Symbolic links will be followed on undo save, possibly causing CVE-2008-1103"
# endif
#endif
- file = BLI_open(filename, oflags, 0666);
-
- if (file == -1) {
- fprintf(stderr, "Unable to save '%s': %s\n",
- filename, errno ? strerror(errno) : "Unknown error opening file");
- return false;
- }
-
- for (chunk = memfile->chunks.first; chunk; chunk = chunk->next) {
- if ((size_t)write(file, chunk->buf, chunk->size) != chunk->size) {
- break;
- }
- }
-
- close(file);
-
- if (chunk) {
- fprintf(stderr, "Unable to save '%s': %s\n",
- filename, errno ? strerror(errno) : "Unknown error writing file");
- return false;
- }
- return true;
+ file = BLI_open(filename, oflags, 0666);
+
+ if (file == -1) {
+ fprintf(stderr,
+ "Unable to save '%s': %s\n",
+ filename,
+ errno ? strerror(errno) : "Unknown error opening file");
+ return false;
+ }
+
+ for (chunk = memfile->chunks.first; chunk; chunk = chunk->next) {
+ if ((size_t)write(file, chunk->buf, chunk->size) != chunk->size) {
+ break;
+ }
+ }
+
+ close(file);
+
+ if (chunk) {
+ fprintf(stderr,
+ "Unable to save '%s': %s\n",
+ filename,
+ errno ? strerror(errno) : "Unknown error writing file");
+ return false;
+ }
+ return true;
}