standards/160673: Return E2BIG if n == 0.

[Henning Petersen]

>Number:         160673
>Category:       standards
>Synopsis:       Return E2BIG if n == 0.
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-standards
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Sep 12 11:30:08 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Henning Petersen
>Release:        FreeBSD-current
>Organization:
>Environment:
>Description:
Return E2BIG if n == 0.
Remove unused variable ret.
>How-To-Repeat:

>Fix:
diff -u -r1.1 citrus_none.c
--- lib/libc/iconv/citrus_none.c	25 Feb 2011 00:04:39 -0000	1.1
+++ lib/libc/iconv/citrus_none.c	9 Sep 2011 06:28:55 -0000
@@ -190,7 +190,6 @@
     void * __restrict pspriv __unused, size_t * __restrict nresult,
     struct iconv_hooks *hooks __unused)
 {
-	int ret;
 
 	if ((wc & ~0xFFU) != 0) {
 		*nresult = (size_t)-1;
@@ -198,7 +197,7 @@
 	}
 	if (n == 0) {
 		*nresult = (size_t)-1;
-		ret = E2BIG;
+		return (E2BIG);
 	}
 
 	*nresult = 1;


Patch attached with submission follows:

diff -u -r1.1 citrus_none.c
--- lib/libc/iconv/citrus_none.c	25 Feb 2011 00:04:39 -0000	1.1
+++ lib/libc/iconv/citrus_none.c	9 Sep 2011 06:28:55 -0000
@@ -190,7 +190,6 @@
     void * __restrict pspriv __unused, size_t * __restrict nresult,
     struct iconv_hooks *hooks __unused)
 {
-	int ret;
 
 	if ((wc & ~0xFFU) != 0) {
 		*nresult = (size_t)-1;
@@ -198,7 +197,7 @@
 	}
 	if (n == 0) {
 		*nresult = (size_t)-1;
-		ret = E2BIG;
+		return (E2BIG);
 	}
 
 	*nresult = 1;


>Release-Note:
>Audit-Trail:
>Unformatted: