Merged muonspin/musrfit:root6 into master
This commit is contained in:
Zaher Salman
commit
97400255a0
@ -5,7 +5,7 @@ if (CMAKE_VERSION GREATER_EQUAL 3.12)
|
||||
cmake_policy(SET CMP0075 NEW)
|
||||
endif (CMAKE_VERSION GREATER_EQUAL 3.12)
|
||||
|
||||
project(musrfit VERSION 1.7.2 LANGUAGES C CXX)
|
||||
project(musrfit VERSION 1.7.3 LANGUAGES C CXX)
|
||||
|
||||
#--- musrfit specific options -------------------------------------------------
|
||||
option(nexus "build optional NeXus support. Needed for ISIS" OFF)
|
||||
|
||||
@ -12,6 +12,12 @@ or
|
||||
|
||||
https://bitbucket.org/muonspin/musrfit/commits/all
|
||||
|
||||
Release of V1.7.3, 2021/06/01
|
||||
=============================
|
||||
|
||||
making musrfit Apple Silicon M1 ready. Currently there is still an open issue
|
||||
with NeXus.
|
||||
|
||||
Release of V1.7.2, 2021/04/16
|
||||
=============================
|
||||
|
||||
|
||||
148
src/external/mud/src/mud.c
vendored
148
src/external/mud/src/mud.c
vendored
@ -23,10 +23,10 @@
|
||||
* v1.2 08-Oct-2000 [D. Arseneau] Add MUD_setSizes
|
||||
* v1.3 22-Apr-2003 [D. Arseneau] Add MUD_openInOut
|
||||
* 25-Nov-2009 [D. Arseneau] Handle larger size_t
|
||||
* 04-May-2016 [D. Arseneau] Edits for C++ use
|
||||
*/
|
||||
|
||||
|
||||
#include <stdio.h>
|
||||
#include "mud.h"
|
||||
|
||||
#ifdef NO_STDARG
|
||||
@ -35,11 +35,10 @@
|
||||
#include <stdarg.h>
|
||||
#endif /* NO_STDARG */
|
||||
|
||||
/* #define DEBUG 1 /* un-comment for debug */
|
||||
/* #define DEBUG 1 */ /* un-comment for debug */
|
||||
|
||||
FILE*
|
||||
MUD_openInput( inFile )
|
||||
char* inFile;
|
||||
MUD_openInput( char* inFile )
|
||||
{
|
||||
FILE* fin;
|
||||
|
||||
@ -53,8 +52,7 @@ MUD_openInput( inFile )
|
||||
|
||||
/* This is the same as MUD_openInput except for access mode */
|
||||
FILE*
|
||||
MUD_openInOut( inFile )
|
||||
char* inFile;
|
||||
MUD_openInOut( char* inFile )
|
||||
{
|
||||
FILE* fin;
|
||||
|
||||
@ -68,8 +66,7 @@ MUD_openInOut( inFile )
|
||||
|
||||
|
||||
FILE*
|
||||
MUD_openOutput( outFile )
|
||||
char* outFile;
|
||||
MUD_openOutput( char* outFile )
|
||||
{
|
||||
FILE* fout;
|
||||
|
||||
@ -83,8 +80,7 @@ MUD_openOutput( outFile )
|
||||
|
||||
|
||||
void
|
||||
MUD_free( pMUD )
|
||||
void* pMUD;
|
||||
MUD_free( void* pMUD )
|
||||
{
|
||||
if( pMUD != NULL ) MUD_free( ((MUD_SEC*)pMUD)->core.pNext );
|
||||
else return;
|
||||
@ -101,10 +97,7 @@ MUD_free( pMUD )
|
||||
|
||||
|
||||
BOOL
|
||||
MUD_encode( pBuf, pMUD, io_opt )
|
||||
BUF* pBuf;
|
||||
void* pMUD;
|
||||
MUD_IO_OPT io_opt;
|
||||
MUD_encode( BUF* pBuf, void* pMUD, MUD_IO_OPT io_opt )
|
||||
{
|
||||
if( pMUD == NULL ) return( TRUE );
|
||||
|
||||
@ -130,7 +123,7 @@ MUD_encode( pBuf, pMUD, io_opt )
|
||||
printf( "MUD_encode: buf.buf = %08X\n", pBuf->buf );
|
||||
#endif /* DEBUG */
|
||||
|
||||
MUD_CORE_proc( MUD_ENCODE, pBuf, pMUD );
|
||||
MUD_CORE_proc( MUD_ENCODE, pBuf, (MUD_SEC*)pMUD );
|
||||
(*((MUD_SEC*)pMUD)->core.proc)( MUD_ENCODE, pBuf, (void*)pMUD );
|
||||
|
||||
if( ( MUD_secID( pMUD ) == MUD_SEC_GRP_ID ) &&
|
||||
@ -155,8 +148,7 @@ MUD_encode( pBuf, pMUD, io_opt )
|
||||
|
||||
|
||||
void*
|
||||
MUD_decode( pBuf )
|
||||
BUF* pBuf;
|
||||
MUD_decode( BUF* pBuf )
|
||||
{
|
||||
MUD_SEC* pMUD;
|
||||
MUD_SEC mud;
|
||||
@ -199,23 +191,20 @@ MUD_decode( pBuf )
|
||||
|
||||
|
||||
int
|
||||
MUD_getSize( pMUD )
|
||||
void* pMUD;
|
||||
MUD_getSize( void* pMUD )
|
||||
{
|
||||
return( MUD_CORE_proc( MUD_GET_SIZE, NULL, pMUD ) +
|
||||
(*((MUD_SEC*)pMUD)->core.proc)( MUD_GET_SIZE, NULL, (void*)pMUD ) );
|
||||
return( MUD_CORE_proc( MUD_GET_SIZE, NULL, (MUD_SEC*)pMUD ) +
|
||||
(*((MUD_SEC*)pMUD)->core.proc)( MUD_GET_SIZE, NULL, pMUD ) );
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
MUD_show( pMUD, io_opt )
|
||||
void* pMUD;
|
||||
MUD_IO_OPT io_opt;
|
||||
MUD_show( void* pMUD, MUD_IO_OPT io_opt )
|
||||
{
|
||||
if( pMUD == NULL ) return;
|
||||
|
||||
MUD_CORE_proc( MUD_SHOW, NULL, pMUD );
|
||||
(*((MUD_SEC*)pMUD)->core.proc)( MUD_SHOW, NULL, (void*)pMUD );
|
||||
MUD_CORE_proc( MUD_SHOW, NULL, (MUD_SEC*)pMUD );
|
||||
(*((MUD_SEC*)pMUD)->core.proc)( MUD_SHOW, NULL, pMUD );
|
||||
|
||||
printf( "\n" );
|
||||
|
||||
@ -233,14 +222,12 @@ MUD_show( pMUD, io_opt )
|
||||
}
|
||||
|
||||
void
|
||||
MUD_heads( pMUD, io_opt )
|
||||
void* pMUD;
|
||||
MUD_IO_OPT io_opt;
|
||||
MUD_heads( void* pMUD, MUD_IO_OPT io_opt )
|
||||
{
|
||||
if( pMUD == NULL ) return;
|
||||
|
||||
MUD_CORE_proc( MUD_HEADS, NULL, pMUD );
|
||||
(*((MUD_SEC*)pMUD)->core.proc)( MUD_HEADS, NULL, (void*)pMUD );
|
||||
MUD_CORE_proc( MUD_HEADS, NULL, (MUD_SEC*)pMUD );
|
||||
(*((MUD_SEC*)pMUD)->core.proc)( MUD_HEADS, NULL, pMUD );
|
||||
|
||||
if( ( MUD_secID( pMUD ) == MUD_SEC_GRP_ID ) &&
|
||||
( io_opt == MUD_ALL ) )
|
||||
@ -260,8 +247,7 @@ MUD_heads( pMUD, io_opt )
|
||||
* MUD_writeEnd() - called after all writes to file
|
||||
*/
|
||||
BOOL
|
||||
MUD_writeEnd( fout )
|
||||
FILE* fout;
|
||||
MUD_writeEnd( FILE* fout )
|
||||
{
|
||||
MUD_SEC_EOF* pMUD_eof;
|
||||
|
||||
@ -282,9 +268,7 @@ MUD_writeEnd( fout )
|
||||
* MUD_writeFile() - use for completely assembled groups/sections
|
||||
*/
|
||||
BOOL
|
||||
MUD_writeFile( fout, pMUD_head )
|
||||
FILE* fout;
|
||||
void* pMUD_head;
|
||||
MUD_writeFile( FILE* fout, void* pMUD_head )
|
||||
{
|
||||
rewind( fout );
|
||||
if( !MUD_write( fout, pMUD_head, MUD_ALL ) ) return( FALSE );
|
||||
@ -296,10 +280,7 @@ MUD_writeFile( fout, pMUD_head )
|
||||
* MUD_write() - use for completely assembled groups/sections
|
||||
*/
|
||||
BOOL
|
||||
MUD_write( fout, pMUD, io_opt )
|
||||
FILE* fout;
|
||||
void* pMUD;
|
||||
MUD_IO_OPT io_opt;
|
||||
MUD_write( FILE* fout, void* pMUD, MUD_IO_OPT io_opt )
|
||||
{
|
||||
BUF buf;
|
||||
|
||||
@ -328,12 +309,8 @@ MUD_write( fout, pMUD, io_opt )
|
||||
* MUD_writeEnd()
|
||||
*/
|
||||
BOOL
|
||||
MUD_writeGrpStart( fout, pMUD_parentGrp,
|
||||
pMUD_grp, numMems )
|
||||
FILE* fout;
|
||||
MUD_SEC_GRP* pMUD_parentGrp;
|
||||
MUD_SEC_GRP* pMUD_grp;
|
||||
int numMems;
|
||||
MUD_writeGrpStart( FILE* fout, MUD_SEC_GRP* pMUD_parentGrp,
|
||||
MUD_SEC_GRP* pMUD_grp, int numMems )
|
||||
{
|
||||
pMUD_grp->pParent = pMUD_parentGrp;
|
||||
|
||||
@ -352,9 +329,7 @@ MUD_writeGrpStart( fout, pMUD_parentGrp,
|
||||
|
||||
|
||||
void
|
||||
addIndex( pMUD_grp, pMUD )
|
||||
MUD_SEC_GRP* pMUD_grp;
|
||||
void* pMUD;
|
||||
addIndex( MUD_SEC_GRP* pMUD_grp, void* pMUD )
|
||||
{
|
||||
MUD_INDEX** ppMUD_index;
|
||||
|
||||
@ -373,10 +348,7 @@ addIndex( pMUD_grp, pMUD )
|
||||
* MUD_writeGrpMem() - use for writes of unassembled groups
|
||||
*/
|
||||
BOOL
|
||||
MUD_writeGrpMem( fout, pMUD_grp, pMUD )
|
||||
FILE* fout;
|
||||
MUD_SEC_GRP* pMUD_grp;
|
||||
void* pMUD;
|
||||
MUD_writeGrpMem( FILE* fout, MUD_SEC_GRP* pMUD_grp, void* pMUD )
|
||||
{
|
||||
((MUD_SEC*)pMUD)->core.size = MUD_getSize( pMUD );
|
||||
|
||||
@ -401,9 +373,7 @@ MUD_writeGrpMem( fout, pMUD_grp, pMUD )
|
||||
* MUD_writeGrpEnd() - use for writes of unassembled groups
|
||||
*/
|
||||
BOOL
|
||||
MUD_writeGrpEnd( fout, pMUD_grp )
|
||||
FILE* fout;
|
||||
MUD_SEC_GRP* pMUD_grp;
|
||||
MUD_writeGrpEnd( FILE* fout, MUD_SEC_GRP* pMUD_grp )
|
||||
{
|
||||
int pos;
|
||||
|
||||
@ -425,8 +395,7 @@ MUD_writeGrpEnd( fout, pMUD_grp )
|
||||
|
||||
|
||||
void*
|
||||
MUD_readFile( fin )
|
||||
FILE* fin;
|
||||
MUD_readFile( FILE* fin )
|
||||
{
|
||||
rewind( fin );
|
||||
|
||||
@ -435,9 +404,7 @@ MUD_readFile( fin )
|
||||
|
||||
|
||||
void*
|
||||
MUD_read( fin, io_opt )
|
||||
FILE* fin;
|
||||
MUD_IO_OPT io_opt;
|
||||
MUD_read( FILE* fin, MUD_IO_OPT io_opt )
|
||||
{
|
||||
BUF buf;
|
||||
MUD_SEC* pMUD_new;
|
||||
@ -455,11 +422,13 @@ MUD_read( fin, io_opt )
|
||||
*/
|
||||
if( ( pos = ftell( fin ) ) == EOF ) return( NULL );
|
||||
if( fread( &size, 4, 1, fin ) == 0 ) return( NULL );
|
||||
#if !defined(__arm64)
|
||||
bdecode_4( &size, &size ); /* byte ordering !!! */
|
||||
#endif // !defined(__arm64)
|
||||
if( fseek( fin, pos, 0 ) == EOF ) return( NULL );
|
||||
|
||||
#ifdef DEBUG
|
||||
printf( "MUD_read: got %d\n", size );
|
||||
printf( "MUD_read: got %lu\n", (unsigned long)(size) );
|
||||
printf( " pos = %d\n", pos );
|
||||
printf( " reading the section ...\n" );
|
||||
#endif /* DEBUG */
|
||||
@ -572,8 +541,7 @@ MUD_read( fin, io_opt )
|
||||
*/
|
||||
|
||||
UINT32
|
||||
MUD_setSizes( pMUD )
|
||||
void* pMUD;
|
||||
MUD_setSizes( void* pMUD )
|
||||
{
|
||||
MUD_SEC* pMember;
|
||||
MUD_INDEX* pGrpIndex;
|
||||
@ -624,8 +592,7 @@ MUD_setSizes( pMUD )
|
||||
|
||||
|
||||
MUD_SEC*
|
||||
MUD_peekCore( fin )
|
||||
FILE* fin;
|
||||
MUD_peekCore( FILE* fin )
|
||||
{
|
||||
static MUD_SEC mud;
|
||||
int pos;
|
||||
@ -847,12 +814,8 @@ MUD_fseek( FILE* fio, ... )
|
||||
|
||||
|
||||
MUD_SEC*
|
||||
fseekNext( fio, pMUD_parent,
|
||||
secID, instanceID )
|
||||
FILE* fio;
|
||||
MUD_SEC_GRP* pMUD_parent;
|
||||
UINT32 secID;
|
||||
UINT32 instanceID;
|
||||
fseekNext( FILE* fio, MUD_SEC_GRP* pMUD_parent,
|
||||
UINT32 secID, UINT32 instanceID )
|
||||
{
|
||||
MUD_SEC* pMUD;
|
||||
MUD_INDEX* pMUD_index;
|
||||
@ -920,8 +883,7 @@ fseekNext( fio, pMUD_parent,
|
||||
|
||||
|
||||
int
|
||||
MUD_fseekFirst( fio )
|
||||
FILE* fio;
|
||||
MUD_fseekFirst( FILE* fio )
|
||||
{
|
||||
int size;
|
||||
|
||||
@ -935,9 +897,7 @@ MUD_fseekFirst( fio )
|
||||
|
||||
|
||||
void
|
||||
MUD_add( ppMUD_head, pMUD_new )
|
||||
void** ppMUD_head;
|
||||
void* pMUD_new;
|
||||
MUD_add( void** ppMUD_head, void* pMUD_new )
|
||||
{
|
||||
MUD_SEC** ppMUD;
|
||||
|
||||
@ -952,8 +912,7 @@ MUD_add( ppMUD_head, pMUD_new )
|
||||
|
||||
|
||||
int
|
||||
MUD_totSize( pMUD )
|
||||
void* pMUD;
|
||||
MUD_totSize( void* pMUD )
|
||||
{
|
||||
return( ( MUD_secID( pMUD ) == MUD_SEC_GRP_ID ) ?
|
||||
MUD_size( pMUD ) + ((MUD_SEC_GRP*)pMUD)->memSize :
|
||||
@ -962,14 +921,13 @@ MUD_totSize( pMUD )
|
||||
|
||||
|
||||
void
|
||||
MUD_addToGroup( pMUD_grp, pMUD )
|
||||
MUD_SEC_GRP* pMUD_grp;
|
||||
void* pMUD;
|
||||
MUD_addToGroup( MUD_SEC_GRP* pMUD_grp, void* pMUD )
|
||||
{
|
||||
MUD_SEC** ppMUD;
|
||||
|
||||
if( pMUD == NULL ) return;
|
||||
|
||||
/* possible addition: ((MUD_SEC*)pMUD)->core.pNext = NULL; */
|
||||
((MUD_SEC*)pMUD)->core.size = MUD_getSize( pMUD );
|
||||
|
||||
for( ppMUD = &pMUD_grp->pMem;
|
||||
@ -985,9 +943,7 @@ MUD_addToGroup( pMUD_grp, pMUD )
|
||||
|
||||
|
||||
void
|
||||
MUD_assignCore( pMUD1, pMUD2 )
|
||||
MUD_SEC* pMUD1;
|
||||
MUD_SEC* pMUD2;
|
||||
MUD_assignCore( MUD_SEC* pMUD1, MUD_SEC* pMUD2 )
|
||||
{
|
||||
bcopy( &pMUD1->core.size, &pMUD2->core.size,
|
||||
MUD_CORE_proc( MUD_GET_SIZE, NULL, NULL ) );
|
||||
@ -995,10 +951,7 @@ MUD_assignCore( pMUD1, pMUD2 )
|
||||
|
||||
|
||||
int
|
||||
MUD_CORE_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC* pMUD;
|
||||
MUD_CORE_proc( MUD_OPT op, BUF* pBuf, MUD_SEC* pMUD )
|
||||
{
|
||||
int size;
|
||||
|
||||
@ -1019,12 +972,13 @@ MUD_CORE_proc( op, pBuf, pMUD )
|
||||
case MUD_GET_SIZE:
|
||||
size = 3*sizeof(UINT32);
|
||||
#ifdef DEBUG
|
||||
printf("MUD_CORE_proc: MUD_GET_SIZE returns size=%d\n",size);
|
||||
printf("MUD_CORE_proc: MUD_GET_SIZE returns size=%d\n",size);
|
||||
#endif /* DEBUG */
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " CORE: size=[%ld], secID=[0x%08lX], instanceID=[0x%08lX]\n",
|
||||
pMUD->core.size, pMUD->core.secID, pMUD->core.instanceID );
|
||||
printf( " CORE: size=[%lu], secID=[0x%08lX], instanceID=[0x%08lX]\n",
|
||||
(unsigned long)(pMUD->core.size), (unsigned long)(pMUD->core.secID),
|
||||
(unsigned long)(pMUD->core.instanceID) );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
break;
|
||||
@ -1034,10 +988,7 @@ MUD_CORE_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_INDEX_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_INDEX* pMUD;
|
||||
MUD_INDEX_proc( MUD_OPT op, BUF* pBuf, MUD_INDEX* pMUD )
|
||||
{
|
||||
int size;
|
||||
|
||||
@ -1065,8 +1016,9 @@ MUD_INDEX_proc( op, pBuf, pMUD )
|
||||
size = 3*sizeof(UINT32);
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " INDEX: offset=[%ld], secID=[0x%08lX], instanceID=[0x%08lX]\n",
|
||||
pMUD->offset, pMUD->secID, pMUD->instanceID );
|
||||
printf( " INDEX: offset=[%lu], secID=[0x%08lX], instanceID=[0x%08lX]\n",
|
||||
(unsigned long)(pMUD->offset), (unsigned long)(pMUD->secID),
|
||||
(unsigned long)(pMUD->instanceID) );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
break;
|
||||
|
||||
80
src/external/mud/src/mud.h
vendored
80
src/external/mud/src/mud.h
vendored
@ -1,19 +1,39 @@
|
||||
#ifndef _MUD_H_
|
||||
#define _MUD_H_
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
/*
|
||||
* v1.2
|
||||
* mud.h Declarations for MUD
|
||||
* v1.3
|
||||
*
|
||||
* Copyright (C) 1994-2021 TRIUMF (Vancouver, Canada)
|
||||
*
|
||||
* Authors: T. Whidden, D. Arseneau, S. Daviel
|
||||
*
|
||||
* Released under the GNU LGPL - see http://www.gnu.org/licenses
|
||||
*
|
||||
* This program is free software; you can distribute it and/or modify it under
|
||||
* the terms of the Lesser GNU General Public License as published by the Free
|
||||
* Software Foundation; either version 2 of the License, or any later version.
|
||||
* Accordingly, this program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
|
||||
* or FITNESS FOR A PARTICULAR PURPOSE. See the Lesser GNU General Public License
|
||||
* for more details.
|
||||
*
|
||||
* revisions:
|
||||
* 01-mar-2000 DJA add UNKNOWN section, with no ID
|
||||
* 11-oct-2000 DJA add MUD_FMT_RAL_ID; MUD_setSizes
|
||||
* 22-Apr-2003 DJA add MUD_openReadWrite, MUD_openInOut
|
||||
* 25-Nov-2009 DJA 64-bit linux
|
||||
* 25-Jun-2017 DJA Allow use in C++ (ROOT); shared lib.
|
||||
* 14-Aug-2019 DJA Use stdint.h, casts in printf
|
||||
*/
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
#ifdef __CINT__
|
||||
typedef char* caddr_t;
|
||||
#endif /* __CINT __ */
|
||||
|
||||
/*
|
||||
* FORMAT IDs - Must be unique!
|
||||
* format of ID is: 0xLLFFSSSS
|
||||
@ -94,31 +114,49 @@ extern "C" {
|
||||
#include <stddef.h>
|
||||
#include <sys/types.h>
|
||||
|
||||
#ifndef NOSTDINT
|
||||
/* If there is no stdint.h, define NOSTDINT, as with "make NOSTDINT=1" */
|
||||
#include <stdint.h>
|
||||
#endif
|
||||
|
||||
/*
|
||||
* MUD types
|
||||
*/
|
||||
|
||||
#ifdef _STDINT_H
|
||||
typedef int STATUS;
|
||||
typedef int8_t INT8;
|
||||
typedef uint8_t UINT8;
|
||||
typedef int16_t INT16;
|
||||
typedef uint16_t UINT16;
|
||||
typedef int32_t INT32;
|
||||
typedef uint32_t UINT32;
|
||||
typedef float REAL32;
|
||||
typedef double REAL64;
|
||||
#else /*no stding.h */
|
||||
typedef int STATUS;
|
||||
typedef char INT8;
|
||||
typedef unsigned char UINT8;
|
||||
typedef short INT16;
|
||||
typedef unsigned short UINT16;
|
||||
#if defined(__alpha) || defined(__x86_64__) || defined(__amd64) || defined(__ia64)
|
||||
#if defined(__alpha) || defined(__linux) || defined(__MACH__) || defined(__arm64)
|
||||
typedef int INT32;
|
||||
typedef unsigned int UINT32;
|
||||
#else
|
||||
typedef long INT32;
|
||||
typedef unsigned long UINT32;
|
||||
#endif /* defined(__alpha) || defined(__x86_64__) || defined(__amd64) || defined(__ia64) */
|
||||
#endif /* __alpha || __linux || __MACH__*/
|
||||
typedef float REAL32;
|
||||
typedef double REAL64;
|
||||
#if (defined(__alpha)&&defined(vms)) || defined(__BORLANDC__) || defined(__TURBOC__)
|
||||
typedef char* caddr_t;
|
||||
#endif
|
||||
#endif /* _STDINT_HNOSTDINT */
|
||||
typedef UINT32 TIME;
|
||||
#ifndef BOOL_DEFINED
|
||||
#define BOOL_DEFINED
|
||||
typedef UINT32 BOOL;
|
||||
#endif
|
||||
#if (defined(__alpha)&&defined(vms)) || defined(__BORLANDC__) || defined(__TURBOC__)
|
||||
typedef char* caddr_t;
|
||||
#endif
|
||||
|
||||
#ifndef FALSE
|
||||
#define FALSE 0
|
||||
@ -146,10 +184,10 @@ typedef char* caddr_t;
|
||||
/*
|
||||
* c_utils.h, Defines for C utilities
|
||||
*/
|
||||
#if defined(vms) || defined(__MSDOS__) || defined(_MSC_VER)
|
||||
#if defined(vms) || defined(__MSDOS__)
|
||||
#define bcopy( b1, b2, len ) memcpy(b2,b1,len)
|
||||
#define bzero( b, len ) memset(b,(char)0,len)
|
||||
#endif /* vms || __MSDOS__ || _MSC_VER */
|
||||
#endif /* vms || __MSDOS__ */
|
||||
#ifndef _C_UTILS_H_ /* conflict with c_utils.h */
|
||||
#define _max( a, b ) ( ( (a) > (b) ) ? (a) : (b) )
|
||||
#define _min( a, b ) ( ( (a) < (b) ) ? (a) : (b) )
|
||||
@ -157,11 +195,12 @@ typedef char* caddr_t;
|
||||
#define _swap32( l ) (((UINT32)l>>16)+((UINT32)l<<16))
|
||||
#define _swap16( s ) (((UINT16)s>>8)+((UINT16)s<<8))
|
||||
#endif
|
||||
#define _free(objp) if(objp!=NULL){free(objp);objp=NULL;}
|
||||
#define _roundUp( n, r ) ( (r) * (int)( ((n)+(r)-1) / (r) ) )
|
||||
|
||||
#define _free(objp) if((void*)(objp)!=(void*)NULL){free((void*)(objp));objp=NULL;}
|
||||
#define _roundUp( n, r ) ( (r) * (int)( ((n)+(r)-1) / (r) ) )
|
||||
|
||||
#define zalloc( n ) memset((void*)malloc(n),0,n)
|
||||
#if defined(vms) || (defined(mips)&&!defined(__sgi)) || ((defined(__MSDOS__) || defined(_MSC_VER))&&defined(__STDC__))
|
||||
#if defined(vms) || (defined(mips)&&!defined(__sgi)) || (defined(__MSDOS__)&&defined(__STDC__))
|
||||
#define strdup( s ) strcpy((char*)malloc(strlen(s)+1),s)
|
||||
#endif /* vms || mips&&!sgi */
|
||||
/*#endif */
|
||||
@ -388,8 +427,7 @@ typedef struct {
|
||||
#define MUD_instanceID( pM ) (((MUD_SEC*)pM)->core.instanceID)
|
||||
|
||||
|
||||
#if defined(__MSDOS__) || defined(__i386__) || defined(__i586__) || defined(__i686__) || defined(vax) || defined(__alpha) || defined(__x86_64__) || defined(__amd64) \
|
||||
|| (defined(__mips)&&!defined(__sgi))
|
||||
#if defined(__MSDOS__) || defined(__i386__) || defined(__i586__) || defined(__i686__) || defined(vax) || defined(__alpha) || defined(__amd64) || defined(__arm64) || (defined(__mips)&&!defined(__sgi))
|
||||
#define MUD_LITTLE_ENDIAN 1
|
||||
#else
|
||||
#define MUD_BIG_ENDIAN 1
|
||||
@ -524,9 +562,9 @@ int MUD_SEC_GEN_HIST_unpack _ANSI_ARGS_(( int num , int inBinSize , void* inHist
|
||||
int MUD_SEC_TRI_TI_RUN_DESC_proc _ANSI_ARGS_(( MUD_OPT op , BUF *pBuf , MUD_SEC_TRI_TI_RUN_DESC *pMUD ));
|
||||
|
||||
/* gmf_time.c */
|
||||
void GMF_MKTIME _ANSI_ARGS_(( time_t* out , INT32* input ));
|
||||
void GMF_TIME _ANSI_ARGS_(( time_t* out ));
|
||||
void GMF_LOCALTIME _ANSI_ARGS_(( time_t* in , INT32 *out ));
|
||||
void GMF_MKTIME _ANSI_ARGS_(( TIME* out , INT32* input ));
|
||||
void GMF_TIME _ANSI_ARGS_(( TIME* out ));
|
||||
void GMF_LOCALTIME _ANSI_ARGS_(( TIME* in , INT32 *out ));
|
||||
|
||||
/* mud_friendly.c */
|
||||
int MUD_openRead _ANSI_ARGS_(( char* filename, UINT32* pType ));
|
||||
|
||||
53
src/external/mud/src/mud_all.c
vendored
53
src/external/mud/src/mud_all.c
vendored
@ -27,13 +27,8 @@
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC* pMUD;
|
||||
MUD_SEC_proc( MUD_OPT op, BUF* pBuf, MUD_SEC* pMUD )
|
||||
{
|
||||
int size;
|
||||
|
||||
switch( op )
|
||||
{
|
||||
case MUD_FREE:
|
||||
@ -55,13 +50,8 @@ MUD_SEC_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_EOF_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_EOF* pMUD;
|
||||
MUD_SEC_EOF_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_EOF* pMUD )
|
||||
{
|
||||
int size;
|
||||
|
||||
switch( op )
|
||||
{
|
||||
case MUD_FREE:
|
||||
@ -83,10 +73,7 @@ MUD_SEC_EOF_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_FIXED_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_FIXED* pMUD;
|
||||
MUD_SEC_FIXED_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_FIXED* pMUD )
|
||||
{
|
||||
int size;
|
||||
|
||||
@ -106,8 +93,8 @@ MUD_SEC_FIXED_proc( op, pBuf, pMUD )
|
||||
size = 2*sizeof( UINT32 );
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " MUD_SEC_FIXED: fileSize=[%ld], formatID=[0x%08lX]\n",
|
||||
pMUD->fileSize, pMUD->formatID );
|
||||
printf( " MUD_SEC_FIXED: fileSize=[%lu], formatID=[0x%08lX]\n",
|
||||
(unsigned long)(pMUD->fileSize), (unsigned long)(pMUD->formatID) );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
break;
|
||||
@ -117,10 +104,7 @@ MUD_SEC_FIXED_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_GRP_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_GRP* pMUD;
|
||||
MUD_SEC_GRP_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_GRP* pMUD )
|
||||
{
|
||||
int size;
|
||||
int i;
|
||||
@ -160,7 +144,7 @@ MUD_SEC_GRP_proc( op, pBuf, pMUD )
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " MUD_SEC_GRP: num=[%ld], memSize=%ld\n",
|
||||
pMUD->num, pMUD->memSize );
|
||||
(long int)(pMUD->num), (long int)(pMUD->memSize) );
|
||||
for( pMUD_index = pMUD->pMemIndex;
|
||||
pMUD_index != NULL;
|
||||
pMUD_index = pMUD_index->pNext )
|
||||
@ -178,10 +162,7 @@ MUD_SEC_GRP_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_CMT_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_CMT* pMUD;
|
||||
MUD_SEC_CMT_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_CMT* pMUD )
|
||||
{
|
||||
int size;
|
||||
char tempStr1[32];
|
||||
@ -221,8 +202,9 @@ MUD_SEC_CMT_proc( op, pBuf, pMUD )
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " MUD_SEC_CMT: \n" );
|
||||
printf( " number:[%ld], prevReply:[%ld], nextReply:[%ld]\n",
|
||||
pMUD->ID, pMUD->prevReplyID, pMUD->nextReplyID );
|
||||
printf( " number:[%lu], prevReply:[%lu], nextReply:[%lu]\n",
|
||||
(unsigned long)(pMUD->ID), (unsigned long)(pMUD->prevReplyID),
|
||||
(unsigned long)(pMUD->nextReplyID) );
|
||||
bintime = pMUD->time;
|
||||
strncpy( tempStr1, ctime( &bintime ), sizeof(tempStr1) );
|
||||
tempStr1[strlen(tempStr1)-1] = '\0';
|
||||
@ -232,11 +214,11 @@ MUD_SEC_CMT_proc( op, pBuf, pMUD )
|
||||
if( pMUD->comment ) printf( " comment:\"%s\"\n", pMUD->comment );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
printf( "Comment number %ld. ", pMUD->ID );
|
||||
printf( "Comment number %lu. ", (unsigned long)(pMUD->ID) );
|
||||
if( pMUD->prevReplyID > 0 )
|
||||
printf(" Re: #%ld. ", pMUD->prevReplyID );
|
||||
printf(" Re: #%lu. ", (unsigned long)(pMUD->prevReplyID) );
|
||||
if( pMUD->nextReplyID > 0 )
|
||||
printf(" Next: #%ld.", pMUD->nextReplyID );
|
||||
printf(" Next: #%lu.", (unsigned long)(pMUD->nextReplyID) );
|
||||
printf( "\n" );
|
||||
bintime = pMUD->time;
|
||||
strncpy( tempStr1, ctime( &bintime ), sizeof(tempStr1) );
|
||||
@ -251,13 +233,8 @@ MUD_SEC_CMT_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_UNKNOWN_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_UNKNOWN* pMUD;
|
||||
MUD_SEC_UNKNOWN_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_UNKNOWN* pMUD )
|
||||
{
|
||||
int size;
|
||||
|
||||
switch( op )
|
||||
{
|
||||
case MUD_FREE:
|
||||
|
||||
71
src/external/mud/src/mud_encode.c
vendored
71
src/external/mud/src/mud_encode.c
vendored
@ -21,15 +21,11 @@
|
||||
* license (unrestricted use).
|
||||
*/
|
||||
|
||||
#include <stdio.h>
|
||||
|
||||
#include "mud.h"
|
||||
|
||||
|
||||
void
|
||||
bdecode_2( b, p )
|
||||
void* b;
|
||||
void* p;
|
||||
bdecode_2( void* b, void* p )
|
||||
{
|
||||
#ifdef MUD_BIG_ENDIAN
|
||||
UINT16 i;
|
||||
@ -42,9 +38,7 @@ bdecode_2( b, p )
|
||||
}
|
||||
|
||||
void
|
||||
bencode_2( b, p )
|
||||
void* b;
|
||||
void* p;
|
||||
bencode_2( void* b, void* p )
|
||||
{
|
||||
#ifdef MUD_BIG_ENDIAN
|
||||
UINT16 i;
|
||||
@ -63,9 +57,7 @@ bencode_2( b, p )
|
||||
}
|
||||
|
||||
void
|
||||
bdecode_4( b, p )
|
||||
void* b;
|
||||
void* p;
|
||||
bdecode_4( void* b,void* p )
|
||||
{
|
||||
#ifdef MUD_BIG_ENDIAN
|
||||
UINT32 i;
|
||||
@ -78,9 +70,7 @@ bdecode_4( b, p )
|
||||
}
|
||||
|
||||
void
|
||||
bencode_4( b, p )
|
||||
void* b;
|
||||
void* p;
|
||||
bencode_4( void* b, void* p )
|
||||
{
|
||||
#ifdef MUD_BIG_ENDIAN
|
||||
UINT32 i;
|
||||
@ -93,9 +83,7 @@ bencode_4( b, p )
|
||||
}
|
||||
|
||||
void
|
||||
bdecode_8( b, p )
|
||||
void* b;
|
||||
void* p;
|
||||
bdecode_8( void* b, void* p )
|
||||
{
|
||||
#ifdef MUD_BIG_ENDIAN
|
||||
UINT32 i[2], i2[2];
|
||||
@ -109,9 +97,7 @@ bdecode_8( b, p )
|
||||
}
|
||||
|
||||
void
|
||||
bencode_8( b, p )
|
||||
void* b;
|
||||
void* p;
|
||||
bencode_8( void* b, void* p )
|
||||
{
|
||||
#ifdef MUD_BIG_ENDIAN
|
||||
UINT32 i[2], i2[2];
|
||||
@ -126,9 +112,7 @@ bencode_8( b, p )
|
||||
|
||||
|
||||
void
|
||||
decode_str( pB, ps )
|
||||
BUF* pB;
|
||||
char** ps;
|
||||
decode_str( BUF* pB, char** ps )
|
||||
{
|
||||
MUD_STR_LEN_TYPE len;
|
||||
|
||||
@ -153,9 +137,7 @@ decode_str( pB, ps )
|
||||
|
||||
|
||||
void
|
||||
encode_str( pB, ps )
|
||||
BUF* pB;
|
||||
char** ps;
|
||||
encode_str( BUF* pB, char** ps )
|
||||
{
|
||||
MUD_STR_LEN_TYPE len;
|
||||
|
||||
@ -223,16 +205,13 @@ static struct sgl_limits {
|
||||
#endif /* !VMS */
|
||||
|
||||
void
|
||||
bencode_float( buf, fp )
|
||||
char* buf;
|
||||
float* fp;
|
||||
bencode_float( char* buf, float* fp )
|
||||
{
|
||||
#ifndef VMS
|
||||
struct ieee_single is;
|
||||
struct vax_single vs;
|
||||
struct sgl_limits *lim;
|
||||
int i;
|
||||
UINT16 sa[2], sb[2];
|
||||
#endif /* !VMS */
|
||||
|
||||
#ifdef VMS
|
||||
@ -262,9 +241,7 @@ shipit:
|
||||
}
|
||||
|
||||
void
|
||||
encode_float( pBuf, fp )
|
||||
BUF* pBuf;
|
||||
float* fp;
|
||||
encode_float( BUF* pBuf, float* fp )
|
||||
{
|
||||
bencode_float( &(pBuf->buf[pBuf->pos]), fp );
|
||||
pBuf->pos += 4;
|
||||
@ -272,9 +249,7 @@ encode_float( pBuf, fp )
|
||||
}
|
||||
|
||||
void
|
||||
bdecode_float( buf, fp )
|
||||
char* buf;
|
||||
float* fp;
|
||||
bdecode_float( char* buf, float* fp )
|
||||
{
|
||||
#ifndef VMS
|
||||
struct ieee_single *isp;
|
||||
@ -315,9 +290,7 @@ shipit:
|
||||
}
|
||||
|
||||
void
|
||||
decode_float( pBuf, fp )
|
||||
BUF* pBuf;
|
||||
float* fp;
|
||||
decode_float( BUF* pBuf, float* fp )
|
||||
{
|
||||
bdecode_float( &(pBuf->buf[pBuf->pos]), fp );
|
||||
pBuf->pos += 4;
|
||||
@ -392,16 +365,13 @@ static struct dbl_limits {
|
||||
|
||||
|
||||
void
|
||||
bencode_double( buf, dp )
|
||||
char* buf;
|
||||
double* dp;
|
||||
bencode_double( char* buf, double* dp )
|
||||
{
|
||||
#ifndef VMS
|
||||
struct ieee_double id;
|
||||
struct vax_double vd;
|
||||
register struct dbl_limits *lim;
|
||||
int i;
|
||||
UINT16 sa[4], sb[4];
|
||||
#endif /* !VMS */
|
||||
|
||||
#ifdef VMS
|
||||
@ -434,9 +404,7 @@ shipit:
|
||||
}
|
||||
|
||||
void
|
||||
encode_double( pBuf, fp )
|
||||
BUF* pBuf;
|
||||
double* fp;
|
||||
encode_double( BUF* pBuf, double* fp )
|
||||
{
|
||||
bencode_double( &(pBuf->buf[pBuf->pos]), fp );
|
||||
pBuf->pos += 8;
|
||||
@ -444,16 +412,13 @@ encode_double( pBuf, fp )
|
||||
}
|
||||
|
||||
void
|
||||
bdecode_double( buf, dp )
|
||||
char* buf;
|
||||
double* dp;
|
||||
bdecode_double( char* buf, double* dp )
|
||||
{
|
||||
#ifndef VMS
|
||||
struct ieee_double id, *idp;
|
||||
struct ieee_double *idp;
|
||||
struct vax_double vd;
|
||||
register struct dbl_limits *lim;
|
||||
int i;
|
||||
UINT16 sa[4], sb[4];
|
||||
#endif /* !VMS */
|
||||
|
||||
#ifdef VMS
|
||||
@ -486,9 +451,7 @@ shipit:
|
||||
}
|
||||
|
||||
void
|
||||
decode_double( pBuf, fp )
|
||||
BUF* pBuf;
|
||||
double* fp;
|
||||
decode_double( BUF* pBuf, double* fp )
|
||||
{
|
||||
bdecode_double( &(pBuf->buf[pBuf->pos]), fp );
|
||||
pBuf->pos += 8;
|
||||
|
||||
541
src/external/mud/src/mud_friendly.c
vendored
541
src/external/mud/src/mud_friendly.c
vendored
File diff suppressed because it is too large
Load Diff
130
src/external/mud/src/mud_gen.c
vendored
130
src/external/mud/src/mud_gen.c
vendored
@ -30,7 +30,7 @@
|
||||
#include <math.h>
|
||||
#include "mud.h"
|
||||
|
||||
/* #define DEBUG 1 /* (un)comment for debug */
|
||||
/* #define DEBUG 1 */ /* (un)comment for debug */
|
||||
#define PACK_OP 1
|
||||
#define UNPACK_OP 2
|
||||
static int pack_op;
|
||||
@ -42,15 +42,11 @@ static void next_few_bins _ANSI_ARGS_(( int num_tot, int inBinSize, void* pHistD
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_GEN_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_GEN_RUN_DESC* pMUD;
|
||||
MUD_SEC_GEN_RUN_DESC_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_GEN_RUN_DESC* pMUD )
|
||||
{
|
||||
int size;
|
||||
char tempStr1[32];
|
||||
char tempStr2[32];
|
||||
int imin,isec;
|
||||
time_t bintime;
|
||||
|
||||
switch( op )
|
||||
@ -124,16 +120,16 @@ MUD_SEC_GEN_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " MUD_SEC_GEN_RUN_DESC: expt:[%ld], run:[%ld]\n",
|
||||
pMUD->exptNumber, pMUD->runNumber );
|
||||
(long)(pMUD->exptNumber), (long)(pMUD->runNumber) );
|
||||
bintime = pMUD->timeBegin;
|
||||
strncpy( tempStr1, ctime( &bintime ), sizeof(tempStr1) );
|
||||
tempStr1[strlen(tempStr1)-1] = '\0';
|
||||
bintime = pMUD->timeEnd;
|
||||
strncpy( tempStr2, ctime( &bintime ), sizeof(tempStr2) );
|
||||
tempStr2[strlen(tempStr2)-1] = '\0';
|
||||
printf( " timeBegin:[%s] [%ld]\n", tempStr1, pMUD->timeBegin );
|
||||
printf( " timeEnd:[%s] [%ld]\n", tempStr2, pMUD->timeEnd );
|
||||
printf( " elapsedSec:[%ld]\n", pMUD->elapsedSec );
|
||||
printf( " timeBegin:[%s] [%lu]\n", tempStr1, (unsigned long)(pMUD->timeBegin) );
|
||||
printf( " timeEnd:[%s] [%lu]\n", tempStr2, (unsigned long)(pMUD->timeEnd) );
|
||||
printf( " elapsedSec:[%ld]\n", (long)(pMUD->elapsedSec) );
|
||||
if( pMUD->title ) printf( " title:\"%s\"\n", pMUD->title );
|
||||
if( pMUD->lab ) printf( " lab:\"%s\"\n", pMUD->lab );
|
||||
if( pMUD->area ) printf( " area:\"%s\"\n", pMUD->area );
|
||||
@ -152,8 +148,8 @@ MUD_SEC_GEN_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
printf( " field:\"%s\"\n", pMUD->field );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
printf( "Run number: %ld\n", pMUD->runNumber );
|
||||
printf( " exper num: %ld\n", pMUD->exptNumber );
|
||||
printf( "Run number: %ld\n", (long)(pMUD->runNumber) );
|
||||
printf( " exper num: %ld\n", (long)(pMUD->exptNumber) );
|
||||
if( pMUD->experimenter )
|
||||
printf( " operator: %s\n", pMUD->experimenter );
|
||||
if( pMUD->method ) printf( " method: %s\n", pMUD->method );
|
||||
@ -165,9 +161,9 @@ MUD_SEC_GEN_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
tempStr2[strlen(tempStr2)-1] = '\0';
|
||||
printf( " began: %s\n ended: %s\n",
|
||||
tempStr1, tempStr2 );
|
||||
printf( " elapsed: %ld:%.2d:%.2d (%ld seconds)\n",
|
||||
(pMUD->elapsedSec/3600), ((pMUD->elapsedSec%3600)/60), (pMUD->elapsedSec%60),
|
||||
pMUD->elapsedSec );
|
||||
printf( " elapsed: %ld:%.2d:%.2d (%lu seconds)\n",
|
||||
(long)(pMUD->elapsedSec/3600), ((pMUD->elapsedSec%3600)/60), (pMUD->elapsedSec%60),
|
||||
(unsigned long)(pMUD->elapsedSec) );
|
||||
if( pMUD->title )
|
||||
{
|
||||
if( strlen( pMUD->title ) > 63 && strlen( pMUD->title ) < 80 )
|
||||
@ -197,10 +193,7 @@ MUD_SEC_GEN_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_GEN_HIST_HDR_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_GEN_HIST_HDR* pMUD;
|
||||
MUD_SEC_GEN_HIST_HDR_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_GEN_HIST_HDR* pMUD )
|
||||
{
|
||||
int size;
|
||||
UINT32 fsBin;
|
||||
@ -246,28 +239,28 @@ MUD_SEC_GEN_HIST_HDR_proc( op, pBuf, pMUD )
|
||||
size += sizeof( MUD_STR_LEN_TYPE ) + _strlen( pMUD->title );
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " MUD_SEC_GEN_HIST_HDR: histType:[0x%08lX]\n", pMUD->histType );
|
||||
printf( " nBytes:[%ld], nBins:[%ld], nEvents:[%ld]\n",
|
||||
pMUD->nBytes, pMUD->nBins, pMUD->nEvents );
|
||||
printf( " MUD_SEC_GEN_HIST_HDR: histType:[0x%08lX]\n", (unsigned long)(pMUD->histType) );
|
||||
printf( " nBytes:[%ld], nBins:[%ld], nEvents:[%lu]\n",
|
||||
(long)(pMUD->nBytes), (long)(pMUD->nBins), (unsigned long)(pMUD->nEvents) );
|
||||
printf( " bytesPerBin:[%ld], fsPerBin:[%ld], t0_ps:[%ld], t0_bin:[%ld]\n",
|
||||
pMUD->bytesPerBin, pMUD->fsPerBin, pMUD->t0_ps, pMUD->t0_bin );
|
||||
(long)(pMUD->bytesPerBin), (long)(pMUD->fsPerBin), (long)(pMUD->t0_ps), (long)(pMUD->t0_bin) );
|
||||
printf( " goodBin1:[%ld], goodBin2:[%ld], bkgd1:[%ld], bkgd2:[%ld]\n",
|
||||
pMUD->goodBin1, pMUD->goodBin2, pMUD->bkgd1, pMUD->bkgd2 );
|
||||
(long)(pMUD->goodBin1), (long)(pMUD->goodBin2), (long)(pMUD->bkgd1), (long)(pMUD->bkgd2) );
|
||||
if( pMUD->title ) printf( " title:\"%s\"\n", pMUD->title );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
if( pMUD->title ) printf( "Hist title: %s\n", pMUD->title );
|
||||
printf( " nBins: %ld, nEvents: %ld, ",
|
||||
pMUD->nBins, pMUD->nEvents );
|
||||
printf( " nBins: %ld, nEvents: %lu, ",
|
||||
(long)(pMUD->nBins), (unsigned long)(pMUD->nEvents) );
|
||||
fsBin = pMUD->fsPerBin;
|
||||
if( fsBin < 16 )
|
||||
{
|
||||
nsBin = 0.078125 * pow( (double)2.0, (double)fsBin );
|
||||
printf( "ns_per_Bin: %.lf\n", nsBin );
|
||||
printf( "ns_per_Bin: %.6lf\n", nsBin );
|
||||
}
|
||||
else if( fsBin < 29 )
|
||||
{
|
||||
nsBin = 0.048828125 * pow( (double)2.0, (double)fsBin - 16 );
|
||||
nsBin = 0.048828125 * pow( (double)2.0, (double)(fsBin - 16) );
|
||||
printf( "ns_per_Bin: %.9lf\n", nsBin );
|
||||
}
|
||||
else
|
||||
@ -277,9 +270,9 @@ MUD_SEC_GEN_HIST_HDR_proc( op, pBuf, pMUD )
|
||||
}
|
||||
|
||||
printf( " t0_ps: %ld, t0_bin: %ld\n",
|
||||
pMUD->t0_ps, pMUD->t0_bin );
|
||||
(long)(pMUD->t0_ps), (long)(pMUD->t0_bin) );
|
||||
printf( " goodBin1: %ld, goodBin2: %ld, bkgd1: %ld, bkgd2: %ld\n",
|
||||
pMUD->goodBin1, pMUD->goodBin2, pMUD->bkgd1, pMUD->bkgd2 );
|
||||
(long)(pMUD->goodBin1), (long)(pMUD->goodBin2), (long)(pMUD->bkgd1), (long)(pMUD->bkgd2) );
|
||||
break;
|
||||
}
|
||||
return( 1 );
|
||||
@ -287,10 +280,7 @@ MUD_SEC_GEN_HIST_HDR_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_GEN_HIST_DAT_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_GEN_HIST_DAT* pMUD;
|
||||
MUD_SEC_GEN_HIST_DAT_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_GEN_HIST_DAT* pMUD )
|
||||
{
|
||||
int size;
|
||||
|
||||
@ -313,7 +303,7 @@ MUD_SEC_GEN_HIST_DAT_proc( op, pBuf, pMUD )
|
||||
size += pMUD->nBytes;
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " MUD_SEC_GEN_HIST_DAT: nBytes:[%ld]\n", pMUD->nBytes );
|
||||
printf( " MUD_SEC_GEN_HIST_DAT: nBytes:[%ld]\n", (long)(pMUD->nBytes) );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
break;
|
||||
@ -323,10 +313,7 @@ MUD_SEC_GEN_HIST_DAT_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_GEN_SCALER_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_GEN_SCALER* pMUD;
|
||||
MUD_SEC_GEN_SCALER_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_GEN_SCALER* pMUD )
|
||||
{
|
||||
int size;
|
||||
|
||||
@ -350,15 +337,16 @@ MUD_SEC_GEN_SCALER_proc( op, pBuf, pMUD )
|
||||
size += sizeof( MUD_STR_LEN_TYPE ) + _strlen( pMUD->label );
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " MUD_SEC_GEN_SCALER: counts[1]:[%ld], counts[0]:[%ld]\n",
|
||||
pMUD->counts[1], pMUD->counts[0] );
|
||||
printf( " MUD_SEC_GEN_SCALER: counts[1]:[%lu], counts[0]:[%lu]\n",
|
||||
(unsigned long)(pMUD->counts[1]), (unsigned long)(pMUD->counts[0]) );
|
||||
if( pMUD->label ) printf( " label:\"%s\"\n", pMUD->label );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
printf( " Scaler " );
|
||||
if( pMUD->label ) printf( "%8s", pMUD->label );
|
||||
else printf( "??? " );
|
||||
printf( " total: %11ld, recent: %ld\n", pMUD->counts[0], pMUD->counts[1] );
|
||||
printf( " total: %11lu, recent: %lu\n",
|
||||
(unsigned long)(pMUD->counts[0]), (unsigned long)(pMUD->counts[1]) );
|
||||
break;
|
||||
}
|
||||
return( 1 );
|
||||
@ -366,10 +354,7 @@ MUD_SEC_GEN_SCALER_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_GEN_IND_VAR_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_GEN_IND_VAR* pMUD;
|
||||
MUD_SEC_GEN_IND_VAR_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_GEN_IND_VAR* pMUD )
|
||||
{
|
||||
int size;
|
||||
|
||||
@ -431,10 +416,7 @@ MUD_SEC_GEN_IND_VAR_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_GEN_ARRAY_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_GEN_ARRAY* pMUD;
|
||||
MUD_SEC_GEN_ARRAY_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_GEN_ARRAY* pMUD )
|
||||
{
|
||||
int size;
|
||||
int i;
|
||||
@ -538,8 +520,8 @@ MUD_SEC_GEN_ARRAY_proc( op, pBuf, pMUD )
|
||||
case MUD_SHOW:
|
||||
printf( " MUD_SEC_GEN_ARRAY: \n" );
|
||||
printf( " num:[%ld], elemSize:[%ld], type:[%ld], hasTime:[%ld], nBytes:[%ld]\n",
|
||||
pMUD->num, pMUD->elemSize, pMUD->type, pMUD->hasTime,
|
||||
pMUD->nBytes );
|
||||
(long)(pMUD->num), (long)(pMUD->elemSize), (long)(pMUD->type), (long)(pMUD->hasTime),
|
||||
(long)(pMUD->nBytes) );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
break;
|
||||
@ -549,42 +531,27 @@ MUD_SEC_GEN_ARRAY_proc( op, pBuf, pMUD )
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_GEN_HIST_pack( num, inBinSize, inHist, outBinSize, outHist )
|
||||
int num;
|
||||
int inBinSize;
|
||||
void* inHist;
|
||||
int outBinSize;
|
||||
void* outHist;
|
||||
MUD_SEC_GEN_HIST_pack( int num, int inBinSize, void* inHist, int outBinSize, void* outHist )
|
||||
{
|
||||
pack_op = PACK_OP;
|
||||
return( MUD_SEC_GEN_HIST_dopack( num, inBinSize, inHist, outBinSize, outHist ) );
|
||||
}
|
||||
|
||||
int
|
||||
MUD_SEC_GEN_HIST_unpack( num, inBinSize, inHist, outBinSize, outHist )
|
||||
int num;
|
||||
int inBinSize;
|
||||
void* inHist;
|
||||
int outBinSize;
|
||||
void* outHist;
|
||||
MUD_SEC_GEN_HIST_unpack( int num, int inBinSize, void* inHist, int outBinSize, void* outHist )
|
||||
{
|
||||
pack_op = UNPACK_OP;
|
||||
return( MUD_SEC_GEN_HIST_dopack( num, inBinSize, inHist, outBinSize, outHist ) );
|
||||
}
|
||||
|
||||
static int
|
||||
MUD_SEC_GEN_HIST_dopack( num, inBinSize, inHist, outBinSize, outHist )
|
||||
int num;
|
||||
int inBinSize;
|
||||
void* inHist;
|
||||
int outBinSize;
|
||||
void* outHist;
|
||||
MUD_SEC_GEN_HIST_dopack( int num, int inBinSize, void* inHist, int outBinSize, void* outHist )
|
||||
{
|
||||
int i;
|
||||
int outLen = 0;
|
||||
MUD_VAR_BIN_LEN_TYPE num_temp;
|
||||
int bin, inLoc, outLoc;
|
||||
int inLen_temp, outLen_temp;
|
||||
int outLen_temp;
|
||||
MUD_VAR_BIN_SIZ_TYPE outBinSize_now, outBinSize_next;
|
||||
MUD_VAR_BIN_SIZ_TYPE inBinSize_temp;
|
||||
UINT8 c, *pc;
|
||||
@ -935,8 +902,7 @@ MUD_SEC_GEN_HIST_dopack( num, inBinSize, inHist, outBinSize, outHist )
|
||||
|
||||
|
||||
static int
|
||||
n_bytes_needed( val )
|
||||
UINT32 val;
|
||||
n_bytes_needed( UINT32 val )
|
||||
{
|
||||
if( val & 0xFFFF0000 ) return( 4 );
|
||||
else if( val & 0x0000FF00 ) return( 2 );
|
||||
@ -946,10 +912,7 @@ n_bytes_needed( val )
|
||||
|
||||
|
||||
static UINT32
|
||||
varBinArray( pHistData, binSize, index )
|
||||
void* pHistData;
|
||||
int binSize;
|
||||
int index;
|
||||
varBinArray( void* pHistData, int binSize, int index )
|
||||
{
|
||||
UINT8 c;
|
||||
UINT16 s;
|
||||
@ -991,17 +954,8 @@ varBinArray( pHistData, binSize, index )
|
||||
|
||||
|
||||
static void
|
||||
next_few_bins( num_tot, inBinSize,
|
||||
pHistData,
|
||||
outBinSize_now,
|
||||
pNum_next,
|
||||
pOutBinSize_next )
|
||||
int num_tot;
|
||||
int inBinSize;
|
||||
void* pHistData;
|
||||
int outBinSize_now;
|
||||
MUD_VAR_BIN_LEN_TYPE* pNum_next;
|
||||
MUD_VAR_BIN_SIZ_TYPE* pOutBinSize_next;
|
||||
next_few_bins( int num_tot, int inBinSize, void* pHistData, int outBinSize_now,
|
||||
MUD_VAR_BIN_LEN_TYPE* pNum_next, MUD_VAR_BIN_SIZ_TYPE* pOutBinSize_next )
|
||||
{
|
||||
int val;
|
||||
MUD_VAR_BIN_LEN_TYPE num_next;
|
||||
|
||||
39
src/external/mud/src/mud_new.c
vendored
39
src/external/mud/src/mud_new.c
vendored
@ -27,13 +27,11 @@
|
||||
* v1.2a 01-Mar-2000 DA Add handling of unidentified sections (don't quit)
|
||||
*/
|
||||
|
||||
|
||||
#include "mud.h"
|
||||
|
||||
|
||||
MUD_SEC*
|
||||
MUD_new( secID, instanceID )
|
||||
UINT32 secID;
|
||||
UINT32 instanceID;
|
||||
MUD_new( UINT32 secID, UINT32 instanceID )
|
||||
{
|
||||
MUD_SEC* pMUD_new;
|
||||
MUD_PROC proc;
|
||||
@ -43,78 +41,78 @@ MUD_new( secID, instanceID )
|
||||
{
|
||||
case MUD_SEC_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC ) );
|
||||
proc = MUD_SEC_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_proc;
|
||||
sizeOf = sizeof( MUD_SEC );
|
||||
break;
|
||||
case MUD_SEC_FIXED_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_FIXED ) );
|
||||
proc = MUD_SEC_FIXED_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_FIXED_proc;
|
||||
sizeOf = sizeof( MUD_SEC_FIXED );
|
||||
break;
|
||||
case MUD_SEC_GRP_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_GRP ) );
|
||||
proc = MUD_SEC_GRP_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_GRP_proc;
|
||||
sizeOf = sizeof( MUD_SEC_GRP );
|
||||
break;
|
||||
case MUD_SEC_EOF_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_EOF ) );
|
||||
proc = MUD_SEC_EOF_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_EOF_proc;
|
||||
sizeOf = sizeof( MUD_SEC_EOF );
|
||||
break;
|
||||
case MUD_SEC_CMT_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_CMT ) );
|
||||
proc = MUD_SEC_CMT_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_CMT_proc;
|
||||
sizeOf = sizeof( MUD_SEC_CMT );
|
||||
break;
|
||||
case MUD_SEC_GEN_RUN_DESC_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_GEN_RUN_DESC ) );
|
||||
proc = MUD_SEC_GEN_RUN_DESC_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_GEN_RUN_DESC_proc;
|
||||
sizeOf = sizeof( MUD_SEC_GEN_RUN_DESC );
|
||||
break;
|
||||
case MUD_SEC_GEN_HIST_HDR_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_GEN_HIST_HDR ) );
|
||||
proc = MUD_SEC_GEN_HIST_HDR_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_GEN_HIST_HDR_proc;
|
||||
sizeOf = sizeof( MUD_SEC_GEN_HIST_HDR );
|
||||
break;
|
||||
case MUD_SEC_GEN_HIST_DAT_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_GEN_HIST_DAT ) );
|
||||
proc = MUD_SEC_GEN_HIST_DAT_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_GEN_HIST_DAT_proc;
|
||||
sizeOf = sizeof( MUD_SEC_GEN_HIST_DAT );
|
||||
break;
|
||||
case MUD_SEC_GEN_SCALER_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_GEN_SCALER ) );
|
||||
proc = MUD_SEC_GEN_SCALER_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_GEN_SCALER_proc;
|
||||
sizeOf = sizeof( MUD_SEC_GEN_SCALER );
|
||||
break;
|
||||
case MUD_SEC_GEN_IND_VAR_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_GEN_IND_VAR ) );
|
||||
proc = MUD_SEC_GEN_IND_VAR_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_GEN_IND_VAR_proc;
|
||||
sizeOf = sizeof( MUD_SEC_GEN_IND_VAR );
|
||||
break;
|
||||
case MUD_SEC_GEN_ARRAY_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_GEN_ARRAY ) );
|
||||
proc = MUD_SEC_GEN_ARRAY_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_GEN_ARRAY_proc;
|
||||
sizeOf = sizeof( MUD_SEC_GEN_ARRAY );
|
||||
break;
|
||||
case MUD_SEC_TRI_TI_RUN_DESC_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_TRI_TI_RUN_DESC ) );
|
||||
proc = MUD_SEC_TRI_TI_RUN_DESC_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_TRI_TI_RUN_DESC_proc;
|
||||
sizeOf = sizeof( MUD_SEC_TRI_TI_RUN_DESC );
|
||||
break;
|
||||
/*
|
||||
case MUD_SEC_CAMP_NUM_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_CAMP_NUM ) );
|
||||
proc = MUD_SEC_CAMP_NUM_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_CAMP_NUM_proc;
|
||||
sizeOf = sizeof( MUD_SEC_CAMP_NUM );
|
||||
break;
|
||||
case MUD_SEC_CAMP_STR_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_CAMP_STR ) );
|
||||
proc = MUD_SEC_CAMP_STR_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_CAMP_STR_proc;
|
||||
sizeOf = sizeof( MUD_SEC_CAMP_STR );
|
||||
break;
|
||||
case MUD_SEC_CAMP_SEL_ID:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_CAMP_SEL ) );
|
||||
proc = MUD_SEC_CAMP_SEL_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_CAMP_SEL_proc;
|
||||
sizeOf = sizeof( MUD_SEC_CAMP_SEL );
|
||||
break;
|
||||
*/
|
||||
@ -122,7 +120,7 @@ MUD_new( secID, instanceID )
|
||||
/* add action for unknown */
|
||||
default:
|
||||
pMUD_new = (MUD_SEC*)zalloc( sizeof( MUD_SEC_UNKNOWN ) );
|
||||
proc = MUD_SEC_UNKNOWN_proc;
|
||||
proc = (MUD_PROC)MUD_SEC_UNKNOWN_proc;
|
||||
sizeOf = sizeof( MUD_SEC_UNKNOWN );
|
||||
break;
|
||||
|
||||
@ -138,4 +136,3 @@ MUD_new( secID, instanceID )
|
||||
return( pMUD_new );
|
||||
}
|
||||
|
||||
|
||||
|
||||
21
src/external/mud/src/mud_tri_ti.c
vendored
21
src/external/mud/src/mud_tri_ti.c
vendored
@ -27,10 +27,7 @@
|
||||
|
||||
|
||||
int
|
||||
MUD_SEC_TRI_TI_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
MUD_OPT op;
|
||||
BUF* pBuf;
|
||||
MUD_SEC_TRI_TI_RUN_DESC* pMUD;
|
||||
MUD_SEC_TRI_TI_RUN_DESC_proc( MUD_OPT op, BUF* pBuf, MUD_SEC_TRI_TI_RUN_DESC* pMUD )
|
||||
{
|
||||
int size;
|
||||
char tempStr1[32];
|
||||
@ -115,8 +112,8 @@ MUD_SEC_TRI_TI_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
size += sizeof( MUD_STR_LEN_TYPE ) + _strlen( pMUD->comment3 );
|
||||
return( size );
|
||||
case MUD_SHOW:
|
||||
printf( " MUD_SEC_TRI_TI_RUN_DESC: expt:[%ld], run:[%ld]\n",
|
||||
pMUD->exptNumber, pMUD->runNumber );
|
||||
printf( " MUD_SEC_TRI_TI_RUN_DESC: expt:[%lu], run:[%lu]\n",
|
||||
(unsigned long)(pMUD->exptNumber), (unsigned long)(pMUD->runNumber) );
|
||||
bintime = pMUD->timeBegin;
|
||||
strncpy( tempStr1, ctime( &bintime ), sizeof(tempStr1) );
|
||||
tempStr1[strlen(tempStr1)-1] = '\0';
|
||||
@ -125,7 +122,7 @@ MUD_SEC_TRI_TI_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
tempStr2[strlen(tempStr2)-1] = '\0';
|
||||
printf( " timeBegin:[%s]\n", tempStr1 );
|
||||
printf( " timeEnd:[%s]\n", tempStr2 );
|
||||
printf( " elapsedSec:[%ld]\n", pMUD->elapsedSec );
|
||||
printf( " elapsedSec:[%lu]\n", (unsigned long)(pMUD->elapsedSec) );
|
||||
if( pMUD->title ) printf( " title:\"%s\"\n", pMUD->title );
|
||||
if( pMUD->lab ) printf( " lab:\"%s\"\n", pMUD->lab );
|
||||
if( pMUD->area ) printf( " area:\"%s\"\n", pMUD->area );
|
||||
@ -148,8 +145,8 @@ MUD_SEC_TRI_TI_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
printf( " comment3:\"%s\"\n", pMUD->comment3 );
|
||||
break;
|
||||
case MUD_HEADS:
|
||||
printf( "Run number: %ld\n", pMUD->runNumber );
|
||||
printf( " exper num: %ld\n", pMUD->exptNumber );
|
||||
printf( "Run number: %lu\n", (unsigned long)(pMUD->runNumber) );
|
||||
printf( " exper num: %lu\n", (unsigned long)(pMUD->exptNumber) );
|
||||
if( pMUD->experimenter )
|
||||
printf( " operator: %s\n", pMUD->experimenter );
|
||||
if( pMUD->method )
|
||||
@ -162,9 +159,9 @@ MUD_SEC_TRI_TI_RUN_DESC_proc( op, pBuf, pMUD )
|
||||
tempStr2[strlen(tempStr2)-1] = '\0';
|
||||
printf( " began: %s\n ended: %s\n",
|
||||
tempStr1, tempStr2 );
|
||||
printf( " elapsed: %ld:%.2d:%.2d (%ld seconds)\n",
|
||||
(pMUD->elapsedSec/3600), ((pMUD->elapsedSec%3600)/60), (pMUD->elapsedSec%60),
|
||||
pMUD->elapsedSec );
|
||||
printf( " elapsed: %ld:%.2d:%.2d (%lu seconds)\n",
|
||||
(long)(pMUD->elapsedSec/3600), ((pMUD->elapsedSec%3600)/60), (pMUD->elapsedSec%60),
|
||||
(unsigned long)(pMUD->elapsedSec) );
|
||||
if( pMUD->title ) printf( " title: %s\n", pMUD->title );
|
||||
if( pMUD->sample ) printf( " sample: %s\n", pMUD->sample );
|
||||
if( pMUD->orient ) printf( " orient: %s\n", pMUD->orient );
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user