[Teem-commit] SF.net SVN: teem:[7517] teem/trunk/src/air

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

Revision: 7517
          http://sourceforge.net/p/teem/code/7517
Author:   kindlmann
Date:     2025-09-29 06:27:50 +0000 (Mon, 29 Sep 2025)
Log Message:
-----------
API CHANGE: airMopDone now returns NULL, as do the wrapper functions airMopError and airMopOkay. When an airMop* is a field somewhere, it is good to NULL it out as soon as its done. Also renamed the new airStrtrunc to just airStrunc

Modified Paths:
--------------
    teem/trunk/src/air/air.h
    teem/trunk/src/air/mop.c
    teem/trunk/src/air/string.c

Modified: teem/trunk/src/air/air.h
===================================================================
--- teem/trunk/src/air/air.h	2025-09-29 04:38:01 UTC (rev 7516)
+++ teem/trunk/src/air/air.h	2025-09-29 06:27:50 UTC (rev 7517)
@@ -514,7 +514,7 @@
 AIR_EXPORT char *airStrdup(const char *s);
 AIR_EXPORT size_t airStrlen(const char *s);
 /* ---- BEGIN non-NrrdIO */
-AIR_EXPORT char *airStrtrunc(char *s, size_t bsize, size_t drop);
+AIR_EXPORT char *airStrunc(char *s, size_t bsize, size_t drop);
 AIR_EXPORT int airStrcmp(const char *s1, const char *s2);
 /* ---- END non-NrrdIO */
 AIR_EXPORT char *airStrtok(char *s, const char *ct, char **last);
@@ -649,9 +649,9 @@
 AIR_EXPORT void airMopMem(airArray *arr, void *_ptrP, int when);
 AIR_EXPORT void airMopUnMem(airArray *arr, void *_ptrP);
 AIR_EXPORT void airMopPrint(airArray *arr, const void *_str, int when);
-AIR_EXPORT void airMopDone(airArray *arr, int error);
-AIR_EXPORT void airMopError(airArray *arr);
-AIR_EXPORT void airMopOkay(airArray *arr);
+AIR_EXPORT airArray *airMopDone(airArray *arr, int error);
+AIR_EXPORT airArray *airMopError(airArray *arr);
+AIR_EXPORT airArray *airMopOkay(airArray *arr);
 AIR_EXPORT void airMopDebug(airArray *arr);
 /* ---- BEGIN non-NrrdIO */
 AIR_EXPORT void airMopSingleDone(airArray *arr, void *ptr, int error);

Modified: teem/trunk/src/air/mop.c
===================================================================
--- teem/trunk/src/air/mop.c	2025-09-29 04:38:01 UTC (rev 7516)
+++ teem/trunk/src/air/mop.c	2025-09-29 06:27:50 UTC (rev 7517)
@@ -248,7 +248,7 @@
   printf("airMopDebug: ^^^^^^^^^^^^^^^^^^^^^^^^^\n");
 }
 
-void
+airArray *
 airMopDone(airArray *arr, int error) {
   airMop *mops;
   unsigned int ii;
@@ -275,19 +275,19 @@
       printf("airMopDone(%p): done!\n", (void*)arr);
     */
   }
-  return;
+  return NULL;
 }
 
-void
+airArray *
 airMopError(airArray *arr) {
 
-  airMopDone(arr, AIR_TRUE);
+  return airMopDone(arr, AIR_TRUE);
 }
 
-void
+airArray *
 airMopOkay(airArray *arr) {
 
-  airMopDone(arr, AIR_FALSE);
+  return airMopDone(arr, AIR_FALSE);
 }
 
 /* ---- BEGIN non-NrrdIO */

Modified: teem/trunk/src/air/string.c
===================================================================
--- teem/trunk/src/air/string.c	2025-09-29 04:38:01 UTC (rev 7516)
+++ teem/trunk/src/air/string.c	2025-09-29 06:27:50 UTC (rev 7517)
@@ -70,7 +70,7 @@
 to hide compile-time info about static buffer sizes to avoid warnings about:
 snprintf ...'%s' directive output may be truncated writing up to ... */
 char *
-airStrtrunc(char *str, size_t bsize, size_t drop) {
+airStrunc(char *str, size_t bsize, size_t drop) {
   if (str) {
     if (1 + drop < bsize) {
       str[bsize - (1 + drop)] = '\0';

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