projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c26e79a
)
Stop using static initialisation so that dcpomatic::write() can be called more than...
author
Carl Hetherington
<cth@carlh.net>
Sun, 19 Jun 2022 21:00:30 +0000
(23:00 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Tue, 21 Jun 2022 16:55:16 +0000
(18:55 +0200)
src/lib/ext.cc
patch
|
blob
|
history
diff --git
a/src/lib/ext.cc
b/src/lib/ext.cc
index 96753eca4927bc78a4d19fe7f6fc729e1a06f9af..5e2ff7d9cbd93a4463f4c5f05ae661a7f955b7b6 100644
(file)
--- a/
src/lib/ext.cc
+++ b/
src/lib/ext.cc
@@
-285,12
+285,26
@@
try
{
ext4_dmask_set (DEBUG_ALL);
{
ext4_dmask_set (DEBUG_ALL);
- /* We rely on static initialization for these */
- static struct ext4_fs fs;
- static struct ext4_mkfs_info info;
+ struct ext4_fs fs;
+ fs.read_only = false;
+ fs.bdev = nullptr;
+ fs.last_inode_bg_id = 0;
+ fs.jbd_fs = nullptr;
+ fs.jbd_journal = nullptr;
+ fs.curr_trans = nullptr;
+ struct ext4_mkfs_info info;
+ info.len = 0;
info.block_size = 4096;
info.block_size = 4096;
+ info.blocks_per_group = 0;
info.inode_size = 128;
info.inode_size = 128;
+ info.inodes = 0;
+ info.journal_blocks = 0;
+ info.dsc_size = 0;
+ for (int i = 0; i < UUID_SIZE; ++i) {
+ info.uuid[i] = rand() & 0xff;
+ }
info.journal = false;
info.journal = false;
+ info.label = nullptr;
#ifdef WIN32
file_windows_name_set(device.c_str());
#ifdef WIN32
file_windows_name_set(device.c_str());