sync

git-svn-id: svn://opensvn.adaptivecomputing.com/maui/trunk@9 3f5042e3-fb1d-0410-be18-d6ca2573e517

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 */

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;

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;