f77-wfc: use args_num data type

jmalak · jmalak · commit 580b6bd0ec79 · 2026-01-05T00:38:22.000+01:00
diff --git a/bld/f77/wfc/c/fccall.c b/bld/f77/wfc/c/fccall.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2025 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2026 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -486,7 +486,7 @@ void    FCCall( void )
 {
     sym_id      sp;
     sym_id      scb;
-    uint        num_args;
+    args_num    argc;
     uint        idx;
     call_handle call;
     cg_type     sp_cgtyp;
@@ -518,17 +518,17 @@ void    FCCall( void )
     } else {
         rtn = CGFEName( sp, sp_cgtyp );
     }
-    num_args = GetU16();
-    if( num_args == 0 ) {
+    argc = GetU16();
+    if( argc == 0 ) {
         arg_vec = NULL;
     } else {
-        // We need num_args + 1 because we use NULL at the end
-        arg_vec = FMemAlloc( ( num_args + 1 ) * sizeof( cg_name ) );
+        // We need argc + 1 because we use NULL at the end
+        arg_vec = FMemAlloc( ( argc + 1 ) * sizeof( cg_name ) );
     }
     call = CGInitCall( rtn, sp_cgtyp, sp );
     if( sp->u.ns.flags & SY_INTRINSIC ) {
         if( IFVarArgs( sp->u.ns.si.fi.index ) ) {
-            CGAddParm( call, CGInteger( num_args, TY_INTEGER ), TY_INTEGER );
+            CGAddParm( call, CGInteger( argc, TY_INTEGER ), TY_INTEGER );
         }
     } else if( (sp->u.ns.flags & SY_SUBPROG_TYPE) == SY_FUNCTION ) {
         if( (Options & OPT_DESCRIPTOR) == 0
@@ -545,7 +545,7 @@ void    FCCall( void )
         }
     }
     idx = 0;
-    for( ; num_args != 0; --num_args ) {
+    for( ; argc != 0; --argc ) {
         arg_info = GetU16();
         ptyp = _GetArgInfoPtyp( arg_info );
         pcode = _GetArgInfoPcode( arg_info );
diff --git a/bld/f77/wfc/c/fcstring.c b/bld/f77/wfc/c/fcstring.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2026 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -95,31 +95,31 @@ cg_name SCBLength( cg_name scb )
 }
 
 
-cg_name Concat( uint num_args, cg_name dest )
+cg_name Concat( args_num argc, cg_name dest )
 //===========================================
 // Do concatenation operation.
 {
-    uint        count;
+    args_num    i;
     call_handle call;
     cg_name     dest_1;
     cg_name     dest_2;
 
-    if( num_args & CAT_TEMP ) {
+    if( argc & CAT_TEMP ) {
         call = InitCall( RT_TCAT );
-        num_args &= ~CAT_TEMP;
-    } else if( num_args == 1 ) {
+        argc &= ~CAT_TEMP;
+    } else if( argc == 1 ) {
         call = InitCall( RT_MOVE );
     } else {
         call = InitCall( RT_CAT );
     }
-    for( count = num_args; count > 0; --count ) {
-        CGAddParm( call, StkElement( count ), TY_LOCAL_POINTER );
+    for( i = argc; i > 0; --i ) {
+        CGAddParm( call, StkElement( i ), TY_LOCAL_POINTER );
     }
-    PopStkElements( num_args );
+    PopStkElements( argc );
     CloneCGName( dest, &dest_1, &dest_2 );
     CGAddParm( call, dest_1, TY_LOCAL_POINTER );
-    if( num_args != 1 ) {
-        CGAddParm( call, CGInteger( num_args, TY_UNSIGNED ), TY_UNSIGNED );
+    if( argc != 1 ) {
+        CGAddParm( call, CGInteger( argc, TY_UNSIGNED ), TY_UNSIGNED );
     }
     return( CGBinary( O_COMMA, CGCall( call ), dest_2, TY_LOCAL_POINTER ) );
 }
diff --git a/bld/f77/wfc/c/gsubprog.c b/bld/f77/wfc/c/gsubprog.c
@@ -2,7 +2,7 @@
 *
 *                            Open Watcom Project
 *
-* Copyright (c) 2002-2025 The Open Watcom Contributors. All Rights Reserved.
+* Copyright (c) 2002-2026 The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -70,7 +70,7 @@ void    GBegCall( itnode *itptr )
 {
     sym_id      sp;
     obj_ptr     curr_obj;
-    int         num_args;
+    args_num    argc;
 
     sp = itptr->sym_ptr;
 #if _CPU == 386
@@ -89,9 +89,9 @@ void    GBegCall( itnode *itptr )
             }
         }
     }
-    num_args = DumpArgInfo( itptr->list );
+    argc = DumpArgInfo( itptr->list );
     curr_obj = ObjSeek( curr_obj );
-    OutU16( num_args );
+    OutU16( argc );
     ObjSeek( curr_obj );
     if( (sp->u.ns.flags & SY_SUBPROG_TYPE) == SY_FUNCTION ) {
         if( sp->u.ns.u1.s.typ == FT_CHAR ) {
diff --git a/bld/f77/wfc/h/fcstring.h b/bld/f77/wfc/h/fcstring.h
@@ -2,6 +2,7 @@
 *
 *                            Open Watcom Project
 *
+* Copyright (c) 2026      The Open Watcom Contributors. All Rights Reserved.
 *    Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.
 *
 *  ========================================================================
@@ -34,5 +35,5 @@ extern cg_name SCBPointer( cg_name scb );
 extern cg_name SCBLenAddr( cg_name scb );
 extern cg_name SCBFlagsAddr( cg_name scb );
 extern cg_name SCBLength( cg_name scb );
-extern cg_name Concat( uint num_args, cg_name dest );
+extern cg_name Concat( args_num argc, cg_name dest );
 extern cg_name CharItemLen( sym_id sym );

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`*`
`3`	`3`	`* Open Watcom Project`
`4`	`4`	`*`
`5`		`-* Copyright (c) 2002-2025 The Open Watcom Contributors. All Rights Reserved.`
	`5`	`+* Copyright (c) 2002-2026 The Open Watcom Contributors. All Rights Reserved.`
`6`	`6`	`* Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.`
`7`	`7`	`*`
`8`	`8`	`* ========================================================================`
`@@ -486,7 +486,7 @@ void FCCall( void )`
`486`	`486`	`{`
`487`	`487`	`sym_id sp;`
`488`	`488`	`sym_id scb;`
`489`		`- uint num_args;`
	`489`	`+ args_num argc;`
`490`	`490`	`uint idx;`
`491`	`491`	`call_handle call;`
`492`	`492`	`cg_type sp_cgtyp;`
`@@ -518,17 +518,17 @@ void FCCall( void )`
`518`	`518`	`} else {`
`519`	`519`	`rtn = CGFEName( sp, sp_cgtyp );`
`520`	`520`	`}`
`521`		`- num_args = GetU16();`
`522`		`- if( num_args == 0 ) {`
	`521`	`+ argc = GetU16();`
	`522`	`+ if( argc == 0 ) {`
`523`	`523`	`arg_vec = NULL;`
`524`	`524`	`} else {`
`525`		`- // We need num_args + 1 because we use NULL at the end`
`526`		`- arg_vec = FMemAlloc( ( num_args + 1 ) * sizeof( cg_name ) );`
	`525`	`+ // We need argc + 1 because we use NULL at the end`
	`526`	`+ arg_vec = FMemAlloc( ( argc + 1 ) * sizeof( cg_name ) );`
`527`	`527`	`}`
`528`	`528`	`call = CGInitCall( rtn, sp_cgtyp, sp );`
`529`	`529`	`if( sp->u.ns.flags & SY_INTRINSIC ) {`
`530`	`530`	`if( IFVarArgs( sp->u.ns.si.fi.index ) ) {`
`531`		`- CGAddParm( call, CGInteger( num_args, TY_INTEGER ), TY_INTEGER );`
	`531`	`+ CGAddParm( call, CGInteger( argc, TY_INTEGER ), TY_INTEGER );`
`532`	`532`	`}`
`533`	`533`	`} else if( (sp->u.ns.flags & SY_SUBPROG_TYPE) == SY_FUNCTION ) {`
`534`	`534`	`if( (Options & OPT_DESCRIPTOR) == 0`
`@@ -545,7 +545,7 @@ void FCCall( void )`
`545`	`545`	`}`
`546`	`546`	`}`
`547`	`547`	`idx = 0;`
`548`		`- for( ; num_args != 0; --num_args ) {`
	`548`	`+ for( ; argc != 0; --argc ) {`
`549`	`549`	`arg_info = GetU16();`
`550`	`550`	`ptyp = _GetArgInfoPtyp( arg_info );`
`551`	`551`	`pcode = _GetArgInfoPcode( arg_info );`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`*`
`3`	`3`	`* Open Watcom Project`
`4`	`4`	`*`
`5`		`-* Copyright (c) 2002-2021 The Open Watcom Contributors. All Rights Reserved.`
	`5`	`+* Copyright (c) 2002-2026 The Open Watcom Contributors. All Rights Reserved.`
`6`	`6`	`* Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.`
`7`	`7`	`*`
`8`	`8`	`* ========================================================================`
`@@ -95,31 +95,31 @@ cg_name SCBLength( cg_name scb )`
`95`	`95`	`}`
`96`	`96`
`97`	`97`
`98`		`-cg_name Concat( uint num_args, cg_name dest )`
	`98`	`+cg_name Concat( args_num argc, cg_name dest )`
`99`	`99`	`//===========================================`
`100`	`100`	`// Do concatenation operation.`
`101`	`101`	`{`
`102`		`- uint count;`
	`102`	`+ args_num i;`
`103`	`103`	`call_handle call;`
`104`	`104`	`cg_name dest_1;`
`105`	`105`	`cg_name dest_2;`
`106`	`106`
`107`		`- if( num_args & CAT_TEMP ) {`
	`107`	`+ if( argc & CAT_TEMP ) {`
`108`	`108`	`call = InitCall( RT_TCAT );`
`109`		`- num_args &= ~CAT_TEMP;`
`110`		`- } else if( num_args == 1 ) {`
	`109`	`+ argc &= ~CAT_TEMP;`
	`110`	`+ } else if( argc == 1 ) {`
`111`	`111`	`call = InitCall( RT_MOVE );`
`112`	`112`	`} else {`
`113`	`113`	`call = InitCall( RT_CAT );`
`114`	`114`	`}`
`115`		`- for( count = num_args; count > 0; --count ) {`
`116`		`- CGAddParm( call, StkElement( count ), TY_LOCAL_POINTER );`
	`115`	`+ for( i = argc; i > 0; --i ) {`
	`116`	`+ CGAddParm( call, StkElement( i ), TY_LOCAL_POINTER );`
`117`	`117`	`}`
`118`		`- PopStkElements( num_args );`
	`118`	`+ PopStkElements( argc );`
`119`	`119`	`CloneCGName( dest, &dest_1, &dest_2 );`
`120`	`120`	`CGAddParm( call, dest_1, TY_LOCAL_POINTER );`
`121`		`- if( num_args != 1 ) {`
`122`		`- CGAddParm( call, CGInteger( num_args, TY_UNSIGNED ), TY_UNSIGNED );`
	`121`	`+ if( argc != 1 ) {`
	`122`	`+ CGAddParm( call, CGInteger( argc, TY_UNSIGNED ), TY_UNSIGNED );`
`123`	`123`	`}`
`124`	`124`	`return( CGBinary( O_COMMA, CGCall( call ), dest_2, TY_LOCAL_POINTER ) );`
`125`	`125`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,6 +2,7 @@`
`2`	`2`	`*`
`3`	`3`	`* Open Watcom Project`
`4`	`4`	`*`
	`5`	`+* Copyright (c) 2026 The Open Watcom Contributors. All Rights Reserved.`
`5`	`6`	`* Portions Copyright (c) 1983-2002 Sybase, Inc. All Rights Reserved.`
`6`	`7`	`*`
`7`	`8`	`* ========================================================================`
`@@ -34,5 +35,5 @@ extern cg_name SCBPointer( cg_name scb );`
`34`	`35`	`extern cg_name SCBLenAddr( cg_name scb );`
`35`	`36`	`extern cg_name SCBFlagsAddr( cg_name scb );`
`36`	`37`	`extern cg_name SCBLength( cg_name scb );`
`37`		`-extern cg_name Concat( uint num_args, cg_name dest );`
	`38`	`+extern cg_name Concat( args_num argc, cg_name dest );`
`38`	`39`	`extern cg_name CharItemLen( sym_id sym );`