From 74d1c8a80c731136998c4e1782f632aef061c7fc Mon Sep 17 00:00:00 2001
From: Adrian Sutherland <adrian@sutherlandonline.org>
Date: Tue, 15 Sep 2020 15:55:29 +0100
Subject: [PATCH] f0042

---
 changelog.txt | 3 +++
 cmssys.h      | 6 +++---
 cmssysc.c     | 6 +++---
 tstarg2.c     | 2 +-
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 5f1ca78..4ae49c1 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,6 +1,9 @@
 GCCLIB Change LOG
 =================
 
+F0042 - Fix for Calltype 5 without a return buffer
+        Fix for CMSargc() return type
+        Fix for tstarg2 CMSplist() casting
 F0041 - REXXSAA RexxVariablePool
 
 0.7.19- 31 August 2020
diff --git a/cmssys.h b/cmssys.h
index e05c3c2..7ece9a9 100644
--- a/cmssys.h
+++ b/cmssys.h
@@ -8,7 +8,7 @@
 #ifndef CMSSYS_INCLUDED
 #define CMSSYS_INCLUDED
 
-#define GCCLIB_VERSION "F0041"
+#define GCCLIB_VERSION "F0042"
 
 #include <stddef.h>
 #include <stdarg.h>
@@ -697,9 +697,9 @@ char **__ARGV(void);
 /**************************************************************************************************/
 /* Get Program ARGC value (number of arguments)                                                   */
 /* __ARGC()                                                                                       */
-/* char *CMSargc(void)                                                                            */
+/* int CMSargc(void)                                                                              */
 /**************************************************************************************************/
-char *__ARGC(void);
+int __ARGC(void);
 #define CMSargc() (__ARGC())
 
 /**************************************************************************************************/
diff --git a/cmssysc.c b/cmssysc.c
index 2fe63af..3f61671 100644
--- a/cmssysc.c
+++ b/cmssysc.c
@@ -206,7 +206,7 @@ int __CMSFNA(char *physical, char *logical, int is_proc, char **ret_val, int arg
   eplist.ArgList = 0;
   eplist.FunctionReturn = &evalblock;
   evalblock = 0;
-  *ret_val = 0;
+  if (ret_val) *ret_val = 0;
 
   /* Process the physical string */
   len = strlen(physical);
@@ -357,9 +357,9 @@ char **__ARGV(void) {
 /**************************************************************************************************/
 /* Get Program ARGC value (number of arguments)                                                   */
 /* __ARGC()                                                                                       */
-/* char *CMSargv(void)                                                                            */
+/* int CMSargc(void)                                                                              */
 /**************************************************************************************************/
-char *__ARGC(void) {
+int __ARGC(void) {
   return GETGCCCRAB()->argc;
 }
 
diff --git a/tstarg2.c b/tstarg2.c
index 54c8771..dd2800f 100644
--- a/tstarg2.c
+++ b/tstarg2.c
@@ -36,7 +36,7 @@ int main(int argc, char *argv[]) {
 
  if (CMSargv() != argv) return 16;
 
- if (strncmp(CMSplist(),"TSTARG2 ",8)) return 17;
+ if (strncmp((char*)CMSplist(),"TSTARG2 ",8)) return 17;
 
  if (CMScalltype() != 0) {
    if ( strncmp(CMSeplist()->Command,"TSTARG2",7) &&