[PATCH] zlib: fix compilation failures with Sun C Compilaer

Do this by removing a couple of useless return statements.  Without this
change, compilation with Sun C Compiler 5.9 (SunOS_i386 Patch 124868-15
2010/08/11) fails with the following message:

  "zlib.c", line 192: void function cannot return value
  "zlib.c", line 201: void function cannot return value
  cc: acomp failed for zlib.c

Signed-off-by: Stefano Lattarini <redacted>
---
 zlib.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/zlib.c b/zlib.c
index bbaa081..61e6df0 100644
--- a/zlib.c
+++ b/zlib.c

@@ -189,7 +189,7 @@ void git_deflate_init_gzip(git_zstream *strm, int level)
 	 * Use default 15 bits, +16 is to generate gzip header/trailer
 	 * instead of the zlib wrapper.
 	 */
-	return do_git_deflate_init(strm, level, 15 + 16);
+	do_git_deflate_init(strm, level, 15 + 16);
 }
 
 void git_deflate_init_raw(git_zstream *strm, int level)

@@ -198,7 +198,7 @@ void git_deflate_init_raw(git_zstream *strm, int level)
 	 * Use default 15 bits, negate the value to get raw compressed
 	 * data without zlib header and trailer.
 	 */
-	return do_git_deflate_init(strm, level, -15);
+	do_git_deflate_init(strm, level, -15);
 }
 
 int git_deflate_abort(git_zstream *strm)

-- 
1.8.1.rc3.897.gb3600c3

Am 22.04.2013 18:18, schrieb Stefano Lattarini:

Do this by removing a couple of useless return statements.  Without this
change, compilation with Sun C Compiler 5.9 (SunOS_i386 Patch 124868-15
2010/08/11) fails with the following message:

   "zlib.c", line 192: void function cannot return value
   "zlib.c", line 201: void function cannot return value
   cc: acomp failed for zlib.c

Hmm, what was I thinking when I introduced these returns in c3c2e1a0? 
:-/ Thanks for catching!

René

On Mon, Apr 22, 2013 at 12:18 PM, Stefano Lattarini
[off-list ref] wrote:

zlib: fix compilation failures with Sun C Compilaer

s/Compilaer/compiler/

Do this by removing a couple of useless return statements.  Without this
change, compilation with Sun C Compiler 5.9 (SunOS_i386 Patch 124868-15
2010/08/11) fails with the following message:

  "zlib.c", line 192: void function cannot return value
  "zlib.c", line 201: void function cannot return value
  cc: acomp failed for zlib.c

Signed-off-by: Stefano Lattarini <redacted>

On 04/22/2013 11:41 PM, Eric Sunshine wrote:

On Mon, Apr 22, 2013 at 12:18 PM, Stefano Lattarini
[off-list ref] wrote:

quoted

zlib: fix compilation failures with Sun C Compilaer

s/Compilaer/compiler/

Oops, well spotted.  Junio, can you fix this locally?

Thanks, and sorry for the stupid typo,
  Stefano