LMU/musrfit
LMU/musrfit
5
0
Fork 0
Code Issues 6 Pull Requests Actions Packages Projects Releases 3 Activity

Merged muonspin/musrfit:root6 into master

Browse Source
This commit is contained in:
Zaher Salman 2021-06-02 14:14:56 +02:00
commit e0ecad2f3a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/dump_header.cpp
View File

@ -447,7 +447,8 @@ int dump_header_mud(const std::string fileName, const std::string fileFormat)
// start time // start time
time_t tval; time_t tval;
struct tm *dt; struct tm *dt;
success = MUD_getTimeBegin( fh, (UINT32*)&tval ); success = MUD_getTimeBegin( fh, &val );
tval = static_cast<time_t>(val);
if (success) { if (success) {
dt = localtime(static_cast<const time_t*>(&tval)); dt = localtime(static_cast<const time_t*>(&tval));
assert(dt); assert(dt);
@ -457,7 +458,8 @@ int dump_header_mud(const std::string fileName, const std::string fileFormat)
std::cout << std::endl << "Run Start Time : ???"; std::cout << std::endl << "Run Start Time : ???";
} }
// stop time // stop time
success = MUD_getTimeEnd( fh, (UINT32*)&tval ); success = MUD_getTimeEnd( fh, &val );
tval = static_cast<time_t>(val);
if (success) { if (success) {
dt = localtime(static_cast<const time_t*>(&tval)); dt = localtime(static_cast<const time_t*>(&tval));
assert(dt); assert(dt);

2
src/external/mud/src/mud.c vendored
View File

@ -422,9 +422,7 @@ MUD_read( FILE* fin, MUD_IO_OPT io_opt )
*/ */
if( ( pos = ftell( fin ) ) == EOF ) return( NULL ); if( ( pos = ftell( fin ) ) == EOF ) return( NULL );
if( fread( &size, 4, 1, fin ) == 0 ) return( NULL ); if( fread( &size, 4, 1, fin ) == 0 ) return( NULL );
#if !defined(__arm64)
bdecode_4( &size, &size ); /* byte ordering !!! */ bdecode_4( &size, &size ); /* byte ordering !!! */
#endif // !defined(__arm64)
if( fseek( fin, pos, 0 ) == EOF ) return( NULL ); if( fseek( fin, pos, 0 ) == EOF ) return( NULL );
#ifdef DEBUG #ifdef DEBUG