projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added checking for missing INFO chunk when loading tape by filename only
[rocksndiamonds.git]
/
src
/
files.c
diff --git
a/src/files.c
b/src/files.c
index c14d8396c8306ed4a44f43df3a526bab91feb35d..61ea14cb7e7cdf1a76cce5382ce68d12af89a12c 100644
(file)
--- a/
src/files.c
+++ b/
src/files.c
@@
-7763,6
+7763,7
@@
static void setTapeInfoToDefaults(void)
tape.scr_fieldx = SCR_FIELDX_DEFAULT;
tape.scr_fieldy = SCR_FIELDY_DEFAULT;
tape.scr_fieldx = SCR_FIELDX_DEFAULT;
tape.scr_fieldy = SCR_FIELDY_DEFAULT;
+ tape.no_info_chunk = TRUE;
tape.no_valid_file = FALSE;
}
tape.no_valid_file = FALSE;
}
@@
-7867,6
+7868,8
@@
static int LoadTape_INFO(File *file, int chunk_size, struct TapeInfo *tape)
int level_identifier_size;
int i;
int level_identifier_size;
int i;
+ tape->no_info_chunk = FALSE;
+
level_identifier_size = getFile16BitBE(file);
level_identifier = checked_malloc(level_identifier_size);
level_identifier_size = getFile16BitBE(file);
level_identifier = checked_malloc(level_identifier_size);
@@
-9760,23
+9763,23
@@
static struct TokenInfo global_setup_tokens[] =
},
{
TYPE_SWITCH,
},
{
TYPE_SWITCH,
- &setup.use_api_server,
"use_api_server"
+ &setup.use_api_server,
TEST_PREFIX
"use_api_server"
},
{
TYPE_STRING,
},
{
TYPE_STRING,
- &setup.api_server_hostname,
"api_server_hostname"
+ &setup.api_server_hostname,
TEST_PREFIX
"api_server_hostname"
},
{
TYPE_STRING,
},
{
TYPE_STRING,
- &setup.api_server_password,
"api_server_password"
+ &setup.api_server_password,
TEST_PREFIX
"api_server_password"
},
{
TYPE_SWITCH,
},
{
TYPE_SWITCH,
- &setup.ask_for_uploading_tapes,
"ask_for_uploading_tapes"
+ &setup.ask_for_uploading_tapes,
TEST_PREFIX
"ask_for_uploading_tapes"
},
{
TYPE_SWITCH,
},
{
TYPE_SWITCH,
- &setup.provide_uploading_tapes,
"provide_uploading_tapes"
+ &setup.provide_uploading_tapes,
TEST_PREFIX
"provide_uploading_tapes"
},
{
TYPE_STRING,
},
{
TYPE_STRING,