Changeset 42389 for trunk/Ohana/src/imregister/base/ConfigInit.c

Timestamp:

Feb 8, 2023, 12:17:35 PM (3 years ago)

Author:

eugene

Message:

merge from eam_branches/ipp-20220316. fixes for more pendantic gcc; add opihi memory stats; string vector improvements; use named macros for fixed string lengths

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/imregister/base/ConfigInit.c (modified) (6 diffs)

trunk/Ohana/src/imregister/base/ConfigInit.c

@@ -6 +6 @@
 
   int i, NDB;
-  char *config, *file, ElixirBase[80], catdir[256];
-  char CatdirPhotcodeFile[256];
-  char MasterPhotcodeFile[256];
+  char *config, *file, ElixirBase[80], catdir[MY_MAX_PATH];
+  char CatdirPhotcodeFile[MY_MAX_PATH];
+  char MasterPhotcodeFile[MY_MAX_PATH];
 
   /*** load configuration info ***/
@@ -28 +28 @@
   WarnConfig (config, "CATDIR",                      "%s", 0, catdir);
   WarnConfig (config, "PHOTCODE_FILE",               "%s", 0, MasterPhotcodeFile);
-  sprintf (ImPhotDB, "%s/Images.dat", catdir);
+  snprintf_nowarn (ImPhotDB, MY_MAX_PATH, "%s/Images.dat", catdir);
 
   /* small text databases: filters, camera defs */ 
@@ -75 +75 @@
                                                    
   WarnConfig (config, "imstats",                     "%s", 0, ElixirBase);
-  sprintf (ImstatFifo, "%s.photcode", ElixirBase);   
+  snprintf_nowarn (ImstatFifo, MY_MAX_PATH, "%s.photcode", ElixirBase);   
   WarnConfig (config, "ptolemy",                     "%s", 0, ElixirBase);
-  sprintf (PtolemyFifo, "%s.photcode", ElixirBase);
+  snprintf_nowarn (PtolemyFifo, MY_MAX_PATH, "%s.photcode", ElixirBase);
 
   if (!ScanConfig (config, "CONNECT", "%s",  0, CONNECT)) {
-    sprintf (CONNECT, "/usr/bin/rsh");
+    snprintf_nowarn (CONNECT, 64, "/usr/bin/rsh");
   }
 
@@ -87 +87 @@
   NDetrendAltDB = 0;
   ALLOCATE (DetrendAltDB, char *, NDB);
-  ALLOCATE (DetrendAltDB[NDetrendAltDB], char, 256);
+  ALLOCATE (DetrendAltDB[NDetrendAltDB], char, MY_MAX_PATH);
   for (i = 1; ScanConfig (config, "DETREND_ALT_DB", "%s", i, DetrendAltDB[NDetrendAltDB]); i++) {
     NDetrendAltDB ++;
@@ -94 +94 @@
       REALLOCATE (DetrendAltDB, char *, NDB);
     }
-    ALLOCATE (DetrendAltDB[NDetrendAltDB], char, 256);
+    ALLOCATE (DetrendAltDB[NDetrendAltDB], char, MY_MAX_PATH);
   }
   free (DetrendAltDB[NDetrendAltDB]);
@@ -104 +104 @@
 
   /* XXX this does not yet write out the master photcode table */
-  sprintf (CatdirPhotcodeFile, "%s/Photcodes.dat", catdir);
+  snprintf_nowarn (CatdirPhotcodeFile, MY_MAX_PATH, "%s/Photcodes.dat", catdir);
   if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile, TRUE)) {
     fprintf (stderr, "error loading photcode table %s or master file %s\n", CatdirPhotcodeFile, MasterPhotcodeFile);