From 37fd2eb6bf0e418778d0596893e570b17a5f0f9e Mon Sep 17 00:00:00 2001 From: dev Date: Wed, 13 Jul 2005 02:12:20 +0000 Subject: [PATCH] sync git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@9 3f5042e3-fb1d-0410-be18-d6ca2573e517 --- include/moab.h | 31 +++++++++++++++++++++++++------ src/mcom/MSec.c | 2 +- src/moab/MNode.c | 4 ++-- 3 files changed, 28 insertions(+), 9 deletions(-) diff --git a/include/moab.h b/include/moab.h index 6934c15..f92c0d4 100644 --- a/include/moab.h +++ b/include/moab.h @@ -21,17 +21,32 @@ typedef struct { typedef struct { long MTime; int FailureCount; - int QCount; /* query count */ - int JCount; /* job count */ - int RCount; /* reservation count */ - int CCount; /* command count */ + int QCount; + int JCount; + int RCount; + int CCount; - int SIsInitialized; /* server (boolean) */ - int IIsInitialized; /* interface (boolean) */ + int SIsInitialized; + int IIsInitialized; char *Messages; } mgrid_t; +typedef struct + { + char *Data; + char *Owner; + char *Source; + long ExpireTime; + long CTime; + int Type; + + int Priority; + int Count; + + void *Next; + } mmb_t; + enum MValModEnum { mvmByte = 0, mvmWord, @@ -191,6 +206,10 @@ typedef struct { # define MAX_MRES 1024 #endif /* MAX_MRES */ +#ifndef MMAX_RSV +# define MMAX_RSV MAX_MRES +#endif + #ifndef MAX_MFSDEPTH # define MAX_MFSDEPTH 24 #endif /* MAX_MFSDEPTH */ diff --git a/src/mcom/MSec.c b/src/mcom/MSec.c index a7c6241..b8c912d 100644 --- a/src/mcom/MSec.c +++ b/src/mcom/MSec.c @@ -1601,7 +1601,7 @@ int MSecCompress( unsigned int Key; unsigned int Size; unsigned int Pos; - unsigned int Command; + unsigned int Command = 0; unsigned int X = 0; unsigned int Y = 9; unsigned int Z = 3; diff --git a/src/moab/MNode.c b/src/moab/MNode.c index a5c0540..db2f4dc 100644 --- a/src/moab/MNode.c +++ b/src/moab/MNode.c @@ -3592,8 +3592,8 @@ int MNodeSetClass( int Mode) /* I (mClear/mAdd/mSet) */ { - char *ptr; - char *ptr2; + char *ptr = NULL; + char *ptr2 = NULL; char *TokPtr;