Changeset 33872 for branches/eam_branches/ipp-20120405/Ohana

Timestamp:

May 16, 2012, 4:17:56 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/photdbc

Files:

• include/dvodist.h (modified) (1 diff)
• include/photdbc.h (modified) (2 diffs)
• src/ConfigInit.c (modified) (1 diff)
• src/md5_ops.c (modified) (4 diffs)
• src/photdbc_catalogs.c (modified) (4 diffs)

branches/eam_branches/ipp-20120405/Ohana/src/photdbc/include/dvodist.h

@@ -27 +27 @@
 char     *dstHostname;
 
-# define MAX_PATH_LENGTH 1024
+# define DVO_MAX_PATH 1024
 
 void          usage();

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

@@ -30 +30 @@
 // need to get RADIUS from Config 
 
-# define MAX_PATH_LENGTH 1024
+# define DVO_MAX_PATH 1024
 
 /* global variables */
@@ -38 +38 @@
 double UNIQ_RADIUS;
 double DMCAL_MIN;;
-char   ImageCat[MAX_PATH_LENGTH];
-char   GSCFILE[MAX_PATH_LENGTH];
-char   CATDIR[MAX_PATH_LENGTH];
+char   ImageCat[DVO_MAX_PATH];
+char   GSCFILE[DVO_MAX_PATH];
+char   CATDIR[DVO_MAX_PATH];
 char  *CATMODE;    /* raw, mef, split, mysql */
 char  *CATFORMAT;  /* internal, elixir, loneos, panstarrs */
-char   PhotCodeFile[MAX_PATH_LENGTH];
+char   PhotCodeFile[DVO_MAX_PATH];
 
 double RMIN;

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

@@ -56 +56 @@
 
   WarnConfig (config, "CATDIR",                 "%s",  0, CATDIR);
-  char *tmpcatdir = abspath (CATDIR, MAX_PATH_LENGTH);
+  char *tmpcatdir = abspath (CATDIR, DVO_MAX_PATH);
   strcpy (CATDIR, tmpcatdir);
   free (tmpcatdir);

branches/eam_branches/ipp-20120405/Ohana/src/photdbc/src/md5_ops.c

@@ -60 +60 @@
   IOBuffer buffer;
 
-  char line[MAX_PATH_LENGTH];
-  int Nline = snprintf (line, MAX_PATH_LENGTH, "md5sum %s\n", filename);
-  assert (Nline < MAX_PATH_LENGTH);
+  char line[DVO_MAX_PATH];
+  int Nline = snprintf (line, DVO_MAX_PATH, "md5sum %s\n", filename);
+  assert (Nline < DVO_MAX_PATH);
 
   write (host->stdio[0], line, Nline);
@@ -72 +72 @@
   fprintf (stderr, "buffer: %s\n", buffer.buffer);
 
-  char result[MAX_PATH_LENGTH], fileout[MAX_PATH_LENGTH];
+  char result[DVO_MAX_PATH], fileout[DVO_MAX_PATH];
   int Nscan = sscanf (buffer.buffer, "%s %s", result, fileout);
   assert (Nscan == 2);
@@ -86 +86 @@
   IOBuffer buffer, stdout_buf, stderr_buf;
 
-  char line[MAX_PATH_LENGTH];
-  int Nline = snprintf (line, MAX_PATH_LENGTH, "job md5sum %s\n", filename);
-  assert (Nline < MAX_PATH_LENGTH);
+  char line[DVO_MAX_PATH];
+  int Nline = snprintf (line, DVO_MAX_PATH, "job md5sum %s\n", filename);
+  assert (Nline < DVO_MAX_PATH);
 
   // fprintf (stderr, "command: %s\n", line);
@@ -119 +119 @@
   // fprintf (stderr, "result from md5sum: %s\n", stdout_buf.buffer);
 
-  char result[MAX_PATH_LENGTH], fileout[MAX_PATH_LENGTH];
+  char result[DVO_MAX_PATH], fileout[DVO_MAX_PATH];
   int Nscan = sscanf (stdout_buf.buffer, "%s %s", result, fileout);
   if (Nscan != 2) {

branches/eam_branches/ipp-20120405/Ohana/src/photdbc/src/photdbc_catalogs.c

@@ -20 +20 @@
 
     // set the parameters which guide catalog open/load/create
-    char hostfile[MAX_PATH_LENGTH];
-    snprintf (hostfile, MAX_PATH_LENGTH, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
+    char hostfile[DVO_MAX_PATH];
+    snprintf (hostfile, DVO_MAX_PATH, "%s/%s.cpt", HOSTDIR, skylist[0].regions[i]->name);
     incatalog.filename  = hostID ? hostfile : skylist[0].filename[i];
     incatalog.Nsecfilt = GetPhotcodeNsecfilt ();
@@ -39 +39 @@
 
     // create output catalog filename
-    char outfile[MAX_PATH_LENGTH];
-    snprintf (outfile, MAX_PATH_LENGTH, "%s/%s.cpt", outroot, skylist[0].regions[i]->name);
+    char outfile[DVO_MAX_PATH];
+    snprintf (outfile, DVO_MAX_PATH, "%s/%s.cpt", outroot, skylist[0].regions[i]->name);
     outcatalog.filename = outfile;
     if (outcatalog.filename == NULL) Shutdown ("error with input catalog name");
@@ -99 +99 @@
 
     // 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;
 
     // ensure that the paths are absolute path names
-    char *tmproot = abspath (outroot, MAX_PATH_LENGTH);
+    char *tmproot = abspath (outroot, DVO_MAX_PATH);
 
     // options / arguments that can affect relastro_client -update-objects:
-    char command[MAX_PATH_LENGTH];
-    snprintf (command, MAX_PATH_LENGTH, "photdbc_client %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -D NMEAS_MIN %d -D NMEAS_MIN_FILTERED %d -D AVE_SIGMA_LIM %f -D SIGMA_MAX %f", 
+    char command[DVO_MAX_PATH];
+    snprintf (command, DVO_MAX_PATH, "photdbc_client %s -hostID %d -D CATDIR %s -hostdir %s -region %f %f %f %f -D NMEAS_MIN %d -D NMEAS_MIN_FILTERED %d -D AVE_SIGMA_LIM %f -D SIGMA_MAX %f", 
               tmproot, table->hosts[i].hostID, CATDIR, table->hosts[i].pathname, 
               REGION.Rmin, REGION.Rmax, REGION.Dmin, REGION.Dmax,
@@ -114 +114 @@
       );
 
-    char tmpline[MAX_PATH_LENGTH];
-    if (VERBOSE)            { snprintf (tmpline, MAX_PATH_LENGTH, "%s -v",                command);                             strcpy (command, tmpline); }
-    if (ExcludeByInstMag)   { snprintf (tmpline, MAX_PATH_LENGTH, "%s -instmag %f %f",    command, INST_MAG_MIN, INST_MAG_MAX); strcpy (command, tmpline); }
-    if (ExcludeByMinSigma)  { snprintf (tmpline, MAX_PATH_LENGTH, "%s -min-sigma %f",     command, SIGMA_MIN_KEEP);             strcpy (command, tmpline); }
-    if (ExcludeByMaxMinMag) { snprintf (tmpline, MAX_PATH_LENGTH, "%s -maxminmag %f",     command, MAX_MIN_MAG);                strcpy (command, tmpline); }
-    if (PHOTCODE_DROP_LIST) { snprintf (tmpline, MAX_PATH_LENGTH, "%s -photcode-drop %s", command, PHOTCODE_DROP_LIST);         strcpy (command, tmpline); }
-    if (PHOTCODE_SKIP_LIST) { snprintf (tmpline, MAX_PATH_LENGTH, "%s -photcode-skip %s", command, PHOTCODE_SKIP_LIST);         strcpy (command, tmpline); }
-    if (CATFORMAT)          { snprintf (tmpline, MAX_PATH_LENGTH, "%s -set-format %s",    command, CATFORMAT);                  strcpy (command, tmpline); }
-    if (CATMODE)            { snprintf (tmpline, MAX_PATH_LENGTH, "%s -set-mode %s",      command, CATMODE);                    strcpy (command, tmpline); }
+    char tmpline[DVO_MAX_PATH];
+    if (VERBOSE)            { snprintf (tmpline, DVO_MAX_PATH, "%s -v",                command);                             strcpy (command, tmpline); }
+    if (ExcludeByInstMag)   { snprintf (tmpline, DVO_MAX_PATH, "%s -instmag %f %f",    command, INST_MAG_MIN, INST_MAG_MAX); strcpy (command, tmpline); }
+    if (ExcludeByMinSigma)  { snprintf (tmpline, DVO_MAX_PATH, "%s -min-sigma %f",     command, SIGMA_MIN_KEEP);                strcpy (command, tmpline); }
+    if (ExcludeByMaxMinMag) { snprintf (tmpline, DVO_MAX_PATH, "%s -maxminmag %f",     command, MAX_MIN_MAG);                   strcpy (command, tmpline); }
+    if (PHOTCODE_DROP_LIST) { snprintf (tmpline, DVO_MAX_PATH, "%s -photcode-drop %s", command, PHOTCODE_DROP_LIST);    strcpy (command, tmpline); }
+    if (PHOTCODE_SKIP_LIST) { snprintf (tmpline, DVO_MAX_PATH, "%s -photcode-skip %s", command, PHOTCODE_SKIP_LIST);    strcpy (command, tmpline); }
+    if (CATFORMAT)          { snprintf (tmpline, DVO_MAX_PATH, "%s -set-format %s",    command, CATFORMAT);                     strcpy (command, tmpline); }
+    if (CATMODE)            { snprintf (tmpline, DVO_MAX_PATH, "%s -set-mode %s",      command, CATMODE);                       strcpy (command, tmpline); }
 
     fprintf (stderr, "command: %s\n", command);