Changeset 7876 for branches/rel12/psModules/src/config/pmConfig.h

Timestamp:

Jul 12, 2006, 11:09:44 AM (20 years ago)

Author:

jhoblitt

Message:

sync rel12 branch with head to get the reverted pmConfigAlloc() & pmConfigRead() APIs.

File:

• branches/rel12/psModules/src/config/pmConfig.h (modified) (5 diffs)

branches/rel12/psModules/src/config/pmConfig.h

@@ -3 +3 @@
  *  @author PAP, IfA
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-28 00:49:13 $
+ *  @version $Revision: 1.11.2.1 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-07-12 21:09:44 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -16 +16 @@
 // What recipe sources have been read so far?
 typedef enum {
-    P_PM_RECIPE_SOURCE_NONE   = 0x00,   // None yet
-    P_PM_RECIPE_SOURCE_SITE   = 0x01,   // Site configuration
-    P_PM_RECIPE_SOURCE_CAMERA = 0x02,   // Camera configuration
-    P_PM_RECIPE_SOURCE_CL     = 0x04,   // Command-line
-    P_PM_RECIPE_SOURCE_ALL    = 0x07    // All sources
+    P_PM_RECIPE_SOURCE_NONE        = 0x00, // None yet
+    P_PM_RECIPE_SOURCE_SITE        = 0x01, // Site configuration
+    P_PM_RECIPE_SOURCE_CAMERA      = 0x02, // Camera configuration
+    P_PM_RECIPE_SOURCE_CL          = 0x04, // Command-line
+    P_PM_RECIPE_SOURCE_SYMBOLIC    = 0x14, // Symbolic link, specified on command-line
+    P_PM_RECIPE_SOURCE_ALL         = 0xff  // All sources
 } p_pmRecipeSource;
 
@@ -32 +33 @@
     psMetadata *files;                  // pmFPAfiles used for analysis
     psDB *database;                     // Database handle
-    int argc;                           // Number of command-line arguments
+    int *argc;                          // Number of command-line arguments
     char **argv;                        // Command-line arguments (raw version)
     // Private members
@@ -40 +41 @@
 pmConfig;
 
-pmConfig *pmConfigAlloc(int argc,       // Number of command-line arguments
+pmConfig *pmConfigAlloc(int *argc,      // Number of command-line arguments
                         char **argv     // Command-line arguments
                        );
@@ -66 +67 @@
  */
 pmConfig *pmConfigRead(
-    int argc,
+    int *argc,
     char **argv);