Changeset 40549 for trunk/Ohana/src/opihi

Timestamp:

Oct 20, 2018, 8:58:31 PM (8 years ago)

Author:

eugene

Message:

add snprintf_nowarn function to avoid compiler warnings from desired snprint truncations

Location:

trunk/Ohana/src/opihi

Files:

• cmd.basic/module.c (modified) (1 diff)
• cmd.data/imspline_apply.c (modified) (1 diff)
• cmd.data/imspline_construct.c (modified) (1 diff)
• dvo/dvo_host_utils.c (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.basic/module.c

@@ -23 +23 @@
   /* search for requested file in MODULES:0 - MODULES:n */
   for (i = 0; i < Nmodules; i++) {
-    snprintf (modname, 16, "MODULES:%d", i);
+    snprintf_nowarn (modname, 16, "MODULES:%d", i);
     modpath = get_variable (modname);
     if (modpath == NULL) {

trunk/Ohana/src/opihi/cmd.data/imspline_apply.c

@@ -47 +47 @@
   gfits_create_matrix (&out[0].header, &out[0].matrix);
   if ((y1[0].file[0] != '*') && (y1[0].file[0] != '(')) {
-    sprintf (out[0].file, "*%s", y1[0].file);
+    snprintf_nowarn (out[0].file, OPIHI_NAME_SIZE, "*%s", y1[0].file);
   } else {
-    sprintf (out[0].file, "%s", y1[0].file);
+    snprintf_nowarn (out[0].file, OPIHI_NAME_SIZE, "%s", y1[0].file);
   }
 

trunk/Ohana/src/opihi/cmd.data/imspline_construct.c

@@ -19 +19 @@
   free (out[0].matrix.buffer);
   if ((in[0].file[0] != '*') && (in[0].file[0] != '(')) {
-    sprintf (out[0].file, "*%s", in[0].file);
+    snprintf_nowarn (out[0].file, OPIHI_NAME_SIZE, "*%s", in[0].file);
   } else {
-    sprintf (out[0].file, "%s", in[0].file);
+    snprintf_nowarn (out[0].file, OPIHI_NAME_SIZE, "%s", in[0].file);
   }
   out[0].bitpix = in[0].bitpix;

trunk/Ohana/src/opihi/dvo/dvo_host_utils.c

@@ -13 +13 @@
   int TIME = time(NULL);
   int PID = getpid();
-  snprintf (uniquer, 12, "%05d.%05d", PID, TIME % 100000);
+  snprintf_nowarn (uniquer, 12, "%05d.%05d", PID, TIME % 100000);
 
   // write the dvo comment (host independent)