Changeset 42389 for trunk/Ohana/src/dvomerge

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/dvomerge/src/dvorepairFixStackIDs.c (modified) (1 diff)
• src/dvomerge/src/dvorepairFixWarpIDs.c (modified) (1 diff)
• src/dvomerge/src/dvosecfilt_catalogs.c (modified) (3 diffs)

trunk/Ohana/src/dvomerge/src/dvorepairFixStackIDs.c

@@ -33 +33 @@
 
   while (fscanf (f, "%s", catdir) != EOF) {
-    snprintf (imageFilenameOld, DVO_MAX_PATH, "%s/Images.dat", catdir);
-    snprintf (imageFilenameNew, DVO_MAX_PATH, "%s/Images.dat.fixed", catdir);
+    snprintf_nowarn (imageFilenameOld, DVO_MAX_PATH, "%s/Images.dat", catdir);
+    snprintf_nowarn (imageFilenameNew, DVO_MAX_PATH, "%s/Images.dat.fixed", catdir);
     
     if ((image = LoadImages (&db, imageFilenameOld, &Nimage)) == NULL) {

trunk/Ohana/src/dvomerge/src/dvorepairFixWarpIDs.c

@@ -46 +46 @@
 
   while (fscanf (f, "%s", catdir) != EOF) {
-    snprintf (imageFilenameOld, DVO_MAX_PATH, "%s/Images.dat", catdir);
-    snprintf (imageFilenameNew, DVO_MAX_PATH, "%s/Images.dat.fixed", catdir);
+    snprintf_nowarn (imageFilenameOld, DVO_MAX_PATH, "%s/Images.dat", catdir);
+    snprintf_nowarn (imageFilenameNew, DVO_MAX_PATH, "%s/Images.dat.fixed", catdir);
     
     if ((image = LoadImages (&db, imageFilenameOld, &Nimage)) == NULL) {

trunk/Ohana/src/dvomerge/src/dvosecfilt_catalogs.c

@@ -34 +34 @@
 
     char hostfile[1024];
-    snprintf (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist->regions[i]->name);
+    snprintf_nowarn (hostfile, 1024, "%s/%s.cpt", HOSTDIR, skylist->regions[i]->name);
 
     dvo_catalog_init (&catalog, TRUE);
@@ -116 +116 @@
     // options / arguments that can affect relastro_client -update-objects:
     char command[DVO_MAX_PATH];
-    snprintf (command, DVO_MAX_PATH, "dvosecfilt_client %s %d -hostID %d -hostdir %s -region %f %f %f %f", 
+    snprintf_nowarn (command, DVO_MAX_PATH, "dvosecfilt_client %s %d -hostID %d -hostdir %s -region %f %f %f %f", 
               abscatdir, Nsecfilt, table->hosts[i].hostID, table->hosts[i].pathname, 
               UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax
@@ -122 +122 @@
 
     char tmpline[DVO_MAX_PATH];
-    if (VERBOSE)    { snprintf (tmpline, DVO_MAX_PATH, "%s -v",      command);             strcpy (command, tmpline); }
-    if (SINGLE_CPT) { snprintf (tmpline, DVO_MAX_PATH, "%s -cpt %s", command, SINGLE_CPT); strcpy (command, tmpline); }
+    if (VERBOSE)    { snprintf_nowarn (tmpline, DVO_MAX_PATH, "%s -v",      command);             strcpy (command, tmpline); }
+    if (SINGLE_CPT) { snprintf_nowarn (tmpline, DVO_MAX_PATH, "%s -cpt %s", command, SINGLE_CPT); strcpy (command, tmpline); }
 
     fprintf (stderr, "command: %s\n", command);