kern/176052: [PATCH] libi386: Do not unnecessarily cast away const

[Christoph Mallon]

>Number:         176052
>Category:       kern
>Synopsis:       [PATCH] libi386: Do not unnecessarily cast away const
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 12 08:20:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Christoph Mallon
>Release:        
>Organization:
>Environment:


	
>Description:
In r245424 a cast was introduced to cast away const.
This is unnecessary and can be avoided by slightly rearranging the code.
>How-To-Repeat:
	
>Fix:
Please apply the patch below.

--- 0001-libi386-Do-not-unnecessarily-cast-away-const.patch begins here ---
>From fbbcc10d3002e3a0a8eb36582443aa4bba8969f6 Mon Sep 17 00:00:00 2001
From: Christoph Mallon <christoph.mallon at gmx.de>
Date: Tue, 15 Jan 2013 11:09:09 +0100
Subject: [PATCH] libi386: Do not unnecessarily cast away const.

---
 sys/boot/i386/libi386/devicename.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/sys/boot/i386/libi386/devicename.c b/sys/boot/i386/libi386/devicename.c
index c7705d7..ed2e1c0 100644
--- a/sys/boot/i386/libi386/devicename.c
+++ b/sys/boot/i386/libi386/devicename.c
@@ -127,17 +127,16 @@ i386_parsedev(struct i386_devdesc **dev, const char *devspec, const char **path)
 		err = EUNIT;
 		goto fail;
 	    }
-	} else {
-		cp = (char *)np;
+	    np = cp;
 	}
-	if (*cp && (*cp != ':')) {
+	if (*np && (*np != ':')) {
 	    err = EINVAL;
 	    goto fail;
 	}
 
 	idev->d_unit = unit;
 	if (path != NULL)
-	    *path = (*cp == 0) ? cp : cp + 1;
+	    *path = (*np == '\0') ? np : np + 1;
 	break;
     case DEVT_ZFS:
 	err = zfs_parsedev((struct zfs_devdesc *)idev, np, path);
-- 
1.8.1.3
--- 0001-libi386-Do-not-unnecessarily-cast-away-const.patch ends here ---


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