[Teem-commit] SF.net SVN: teem:[7537] teem/trunk/src/gage/stackBlur .c

[<kin...@us...>]

Revision: 7537
          http://sourceforge.net/p/teem/code/7537
Author:   kindlmann
Date:     2025-09-30 14:44:56 +0000 (Tue, 30 Sep 2025)
Log Message:
-----------
reducing warnings associated with sprintf and snprintf

Modified Paths:
--------------
    teem/trunk/src/gage/stackBlur.c

Modified: teem/trunk/src/gage/stackBlur.c
===================================================================
--- teem/trunk/src/gage/stackBlur.c	2025-09-30 14:33:56 UTC (rev 7536)
+++ teem/trunk/src/gage/stackBlur.c	2025-09-30 14:44:56 UTC (rev 7537)
@@ -125,8 +125,9 @@
                          char explain[AIR_STRLEN_LARGE + 1]) {
   static const char me[] = "gageStackBlurParmCompare", baseA[] = "A", baseB[] = "B";
   const char *nameA, *nameB;
-  unsigned int si, warnLen = AIR_STRLEN_LARGE / 4;
-  char stmp[2][AIR_STRLEN_LARGE + 1], subexplain[AIR_STRLEN_LARGE + 1];
+#define ASL AIR_STRLEN_LARGE
+  unsigned int si, warnLen = ASL / 4;
+  char stmp[2][ASL + 1], subexplain[ASL + 1];
 
   if (!(aa && bb && differ)) {
     biffAddf(GAGE, "%s: got NULL pointer (%p %p %p)", me, AIR_CVOIDP(aa), AIR_CVOIDP(bb),
@@ -136,7 +137,7 @@
   nameA = _nameA ? _nameA : baseA;
   nameB = _nameB ? _nameB : baseB;
   if (strlen(nameA) + strlen(nameB) > warnLen) {
-    biffAddf(GAGE, "%s: names (len %s, %s) might lead to overflow", me,
+    biffAddf(GAGE, "%s: names (len %s, %s) might cause string buffer overflow", me,
              airSprintSize_t(stmp[0], strlen(nameA)),
              airSprintSize_t(stmp[1], strlen(nameB)));
     return 1;
@@ -160,8 +161,8 @@
 #define CHECK(VAR, FMT)                                                                 \
   if (aa->VAR != bb->VAR) {                                                             \
     if (explain) {                                                                      \
-      sprintf(explain, "%s->" #VAR "=" #FMT " != %s->" #VAR "=" #FMT, nameA, aa->VAR,   \
-              nameB, bb->VAR);                                                          \
+      snprintf(explain, ASL + 1, "%s->" #VAR "=" #FMT " != %s->" #VAR "=" #FMT, nameA,  \
+               aa->VAR, nameB, bb->VAR);                                                \
     }                                                                                   \
     *differ = 1;                                                                        \
     return 0;                                                                           \
@@ -180,9 +181,9 @@
 #undef CHECK
   if (aa->sigmaSampling != bb->sigmaSampling) {
     if (explain) {
-      sprintf(explain, "%s->sigmaSampling=%s != %s->sigmaSampling=%s", nameA,
-              airEnumStr(gageSigmaSampling, aa->sigmaSampling), nameB,
-              airEnumStr(gageSigmaSampling, bb->sigmaSampling));
+      snprintf(explain, ASL + 1, "%s->sigmaSampling=%s != %s->sigmaSampling=%s", nameA,
+               airEnumStr(gageSigmaSampling, aa->sigmaSampling), nameB,
+               airEnumStr(gageSigmaSampling, bb->sigmaSampling));
     }
     *differ = 1;
     return 0;
@@ -190,8 +191,8 @@
   for (si = 0; si < aa->num; si++) {
     if (aa->sigma[si] != bb->sigma[si]) {
       if (explain) {
-        sprintf(explain, "%s->sigma[%u]=%.17g != %s->sigma[%u]=%.17g", nameA, si,
-                aa->sigma[si], nameB, si, bb->sigma[si]);
+        snprintf(explain, ASL + 1, "%s->sigma[%u]=%.17g != %s->sigma[%u]=%.17g", nameA,
+                 si, aa->sigma[si], nameB, si, bb->sigma[si]);
       }
       *differ = 1;
       return 0;
@@ -203,7 +204,8 @@
   }
   if (*differ) {
     if (explain) {
-      sprintf(explain, "kernel specs different: %s", subexplain);
+      snprintf(explain, ASL + 1, "kernel specs different: %s",
+               airStrunc(subexplain, ASL + 1, 30));
     }
     *differ = 1;
     return 0;
@@ -214,7 +216,8 @@
   }
   if (*differ) {
     if (explain) {
-      sprintf(explain, "boundary specs different: %s", subexplain);
+      snprintf(explain, ASL + 1, "boundary specs different: %s",
+               airStrunc(subexplain, ASL + 1, 30));
     }
     *differ = 1;
     return 0;
@@ -221,6 +224,7 @@
   }
   /* no differences so far */
   *differ = 0;
+#undef ASL
   return 0;
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.