Changeset 33874

Timestamp:

May 16, 2012, 4:18:34 PM (14 years ago)

Author:

eugene

Message:

move max path length to dvo.h and rename DVO_MAX_PATH

Location:

branches/eam_branches/ipp-20120405/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/ConfigInit.c (modified) (1 diff)
• src/load_catalogs.c (modified) (1 diff)
• src/reload_catalogs.c (modified) (1 diff)
• src/relphot_objects.c (modified) (1 diff)

branches/eam_branches/ipp-20120405/Ohana/src/relphot/include/relphot.h

@@ -81 +81 @@
 
 /* global variables set in parameter file */
-# define MAX_PATH_LENGTH 1024
-char   ImageCat[MAX_PATH_LENGTH];
-char   ImageTemplate[MAX_PATH_LENGTH];
-char   CatTemplate[MAX_PATH_LENGTH];
-char   GSCFILE[MAX_PATH_LENGTH];
+# define DVO_MAX_PATH 1024
+char   ImageCat[DVO_MAX_PATH];
+char   ImageTemplate[DVO_MAX_PATH];
+char   CatTemplate[DVO_MAX_PATH];
+char   GSCFILE[DVO_MAX_PATH];
 char  *CATDIR;
 char   CATMODE[16];    /* raw, mef, split, mysql */
 char   CATFORMAT[16];  /* internal, elixir, loneos, panstarrs */
-char   CameraConfig[MAX_PATH_LENGTH];
+char   CameraConfig[DVO_MAX_PATH];
 char   CAMERA[64];    /* eg, gpc1 */
-char   SKY_TABLE[MAX_PATH_LENGTH];
+char   SKY_TABLE[DVO_MAX_PATH];
 int    SKY_DEPTH;  /** XXX EAM : depth of catalog tables, fix usage */
 

branches/eam_branches/ipp-20120405/Ohana/src/relphot/src/ConfigInit.c

@@ -35 +35 @@
   // force CATDIR to be absolute (so parallel mode will work)
   char *tmpcatdir = NULL;
-  ALLOCATE (tmpcatdir, char, MAX_PATH_LENGTH);
+  ALLOCATE (tmpcatdir, char, DVO_MAX_PATH);
   GetConfig (config, "CATDIR",                 "%s",  0, tmpcatdir);
-  CATDIR = abspath (tmpcatdir, MAX_PATH_LENGTH);
+  CATDIR = abspath (tmpcatdir, DVO_MAX_PATH);
   free (tmpcatdir);
 

branches/eam_branches/ipp-20120405/Ohana/src/relphot/src/load_catalogs.c

@@ -123 +123 @@
 
     // ensure that the paths are absolute path names
-    char *tmppath = abspath (table->hosts[i].pathname, MAX_PATH_LENGTH);
+    char *tmppath = abspath (table->hosts[i].pathname, DVO_MAX_PATH);
     free (table->hosts[i].pathname);
     table->hosts[i].pathname = tmppath;

branches/eam_branches/ipp-20120405/Ohana/src/relphot/src/reload_catalogs.c

@@ -141 +141 @@
 
     // ensure that the paths are absolute path names
-    char *tmppath = abspath (table->hosts[i].pathname, MAX_PATH_LENGTH);
+    char *tmppath = abspath (table->hosts[i].pathname, DVO_MAX_PATH);
     free (table->hosts[i].pathname);
     table->hosts[i].pathname = tmppath;

branches/eam_branches/ipp-20120405/Ohana/src/relphot/src/relphot_objects.c

@@ -133 +133 @@
 
     // ensure that the paths are absolute path names
-    char *tmppath = abspath (table->hosts[i].pathname, MAX_PATH_LENGTH);
+    char *tmppath = abspath (table->hosts[i].pathname, DVO_MAX_PATH);
     free (table->hosts[i].pathname);
     table->hosts[i].pathname = tmppath;