Merge branch 'v2.x/staging' into zss-tls1.3

zowe · Oct 12, 2023 · 5030262 · 5030262
2 parents 101b478 + 4b3aa89
commit 5030262
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/c/zos.c b/c/zos.c
@@ -1500,9 +1500,8 @@ void wtoMessage(const char *message){
 }
 
 #define WTO_MAX_SIZE 126
-void wtoPrintf3(const char *formatString, ...) {
+void wtoPrintf3(const char *formatString, va_list arg) {
   char text[WTO_MAX_SIZE+1];       /* Allow for trailing null character */
-  va_list argPointer;
   int cnt;
 
   for (int pass=0; pass<2; pass++){
@@ -1515,9 +1514,7 @@ void wtoPrintf3(const char *formatString, ...) {
        to every successful request.
     */
 
-    va_start(argPointer,formatString);
-    cnt = vsnprintf(text,sizeof(text),formatString,argPointer);
-    va_end(argPointer);
+    cnt = vsnprintf(text,sizeof(text),formatString,arg);
 
     if (cnt<0){
       if (pass==0)

diff --git a/h/zos.h b/h/zos.h
@@ -13,6 +13,12 @@
 #ifndef __ZOS__
 #define __ZOS__  1
 
+#ifdef METTLE
+#include <metal/stdarg.h>
+#else
+#include <stdarg.h>
+#endif
+
 #ifndef __LONGNAME__
 
 #define extractPSW EXTRPSW
@@ -1538,7 +1544,7 @@ int dsabIsOMVS(DSAB *dsab);
 
 void wtoMessage(const char *message);
 
-void wtoPrintf3(const char *formatString, ...);
+void wtoPrintf3(const char *formatString, va_list arg);
 
 int locate(char *dsn, int *volserCount, char *firstVolser);