(file) Return to Config.c CVS log (file) (dir) Up to [Pegasus] / pegasus / src / Executor

Diff for /pegasus/src/Executor/Config.c between version 1.1.2.2 and 1.1.2.3

version 1.1.2.2, 2007/01/10 01:59:28 version 1.1.2.3, 2007/01/11 20:48:24
Line 38 
Line 38 
 #include "Strlcat.h" #include "Strlcat.h"
 #include "Path.h" #include "Path.h"
 #include "Defines.h" #include "Defines.h"
   #include "Globals.h"
   #include "Assert.h"
  
 /* /*
 **============================================================================== **==============================================================================
Line 78 
Line 80 
 */ */
  
 int GetConfigParamFromCommandLine( int GetConfigParamFromCommandLine(
     int argc,  
     char** argv,  
     const char* name,     const char* name,
     char value[EXECUTOR_BUFFER_SIZE])     char value[EXECUTOR_BUFFER_SIZE])
 { {
     size_t n = strlen(name);     size_t n = strlen(name);
     int i;     int i;
  
     for (i = 1; i < argc; i++)      EXECUTOR_ASSERT(globals.argv != NULL);
   
       for (i = 1; i < globals.argc; i++)
     {     {
         if (strncmp(argv[i], name, n) == 0 && argv[i][n] == '=')          if (strncmp(globals.argv[i], name, n) == 0 && globals.argv[i][n] == '=')
         {         {
             const char* p = argv[i] + n + 1;              Strlcpy(value, globals.argv[i] + n + 1, EXECUTOR_BUFFER_SIZE);
             Strlcpy(value, argv[i] + n + 1, EXECUTOR_BUFFER_SIZE);  
             return 0;             return 0;
         }         }
     }     }
Line 175 
Line 176 
 */ */
  
 int GetConfigParam( int GetConfigParam(
     int argc,  
     char** argv,  
     const char* name,     const char* name,
     char value[EXECUTOR_BUFFER_SIZE])     char value[EXECUTOR_BUFFER_SIZE])
 { {
Line 185 
Line 184 
  
     /* (1) First check command line. */     /* (1) First check command line. */
  
     if (GetConfigParamFromCommandLine(argc, argv, name, value) == 0)      if (GetConfigParamFromCommandLine(name, value) == 0)
         return 0;         return 0;
  
     /* (2) Next check planned config file. */     /* (2) Next check planned config file. */


Legend:
Removed from v.1.1.2.2  
changed lines
  Added in v.1.1.2.3

No CVS admin address has been configured
Powered by
ViewCVS 0.9.2