Re: current git Fails to compile on Solaris 11 x86

[Peter Stephenson <p.w.stephenson@ntlworld.com>]

> On 20/03/2024 15:05 GMT Clinton Bunch <cdb_zsh@zentaur.org> wrote:
> 
>  
> On 3/20/2024 9:54 AM, Bart Schaefer wrote:
> > On Wed, Mar 20, 2024 at 5:22 AM Clinton Bunch <cdb_zsh@zentaur.org> wrote:
> >> On 3/20/2024 05:19, Peter Stephenson wrote:
> >>> Let's just rename it and the others in that area.
> >>>
> >> I'm getting the same error with that patch applied.   What I saw on the
> >> lines it errored on were return statements returning the value of a
> >> function in a wrapper function defined to return void. Perhaps, simply
> >> removing the return keyword?
> > Yes, just removing the "return" from the void function is all that's needed.
> What I was unsure of was whether removing the return or changing the 
> type of the wrapper function was the appropriate fix.  That would 
> require more familiarity with the code than I have (or at this time want 
> to put in the effort to get) to answer.  I mostly wanted to make others 
> aware of the problem.

The wrapper function just fits a generic form, so should stay void.
It's as simple as it looks.  (I guess the line numbers were out in the
code I was looking at so I misidentified what it was complaining about.)

diff --git a/Src/Modules/hlgroup.c b/Src/Modules/hlgroup.c
index 6382f32..230f453 100644
--- a/Src/Modules/hlgroup.c
+++ b/Src/Modules/hlgroup.c
@@ -137,7 +137,7 @@ getpmesc(UNUSED(HashTable ht), const char *name)
 static void
 scanpmesc(UNUSED(HashTable ht), ScanFunc func, int flags)
 {
-    return scangroup(func, flags, 0);
+    scangroup(func, flags, 0);
 }
 
 /**/
@@ -151,7 +151,7 @@ getpmsgr(UNUSED(HashTable ht), const char *name)
 static void
 scanpmsgr(UNUSED(HashTable ht), ScanFunc func, int flags)
 {
-    return scangroup(func, flags, 1);
+    scangroup(func, flags, 1);
 }
 
 static struct paramdef partab[] = {