From owner-svn-src-projects@FreeBSD.ORG  Thu May 17 07:05:49 2012
Return-Path: <owner-svn-src-projects@FreeBSD.ORG>
Delivered-To: svn-src-projects@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1EDE9106564A;
	Thu, 17 May 2012 07:05:49 +0000 (UTC)
	(envelope-from gber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id E5C928FC16;
	Thu, 17 May 2012 07:05:48 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4H75mLb083725;
	Thu, 17 May 2012 07:05:48 GMT (envelope-from gber@svn.freebsd.org)
Received: (from gber@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4H75mGt083722;
	Thu, 17 May 2012 07:05:48 GMT (envelope-from gber@svn.freebsd.org)
Message-Id: <201205170705.q4H75mGt083722@svn.freebsd.org>
From: Grzegorz Bernacki <gber@FreeBSD.org>
Date: Thu, 17 May 2012 07:05:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-projects@freebsd.org
X-SVN-Group: projects
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235532 - projects/nand/usr.sbin/nandsim
X-BeenThere: svn-src-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the src &quot; projects&quot;
	tree" <svn-src-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-projects>
List-Post: <mailto:svn-src-projects@freebsd.org>
List-Help: <mailto:svn-src-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-projects>, 
	<mailto:svn-src-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 17 May 2012 07:05:49 -0000

Author: gber
Date: Thu May 17 07:05:48 2012
New Revision: 235532
URL: http://svn.freebsd.org/changeset/base/235532

Log:
  nandsim: fix warnings reported by clang
  
  Obtained from: Semihalf
  Supported by:  FreeBSD Foundation, Juniper Networks

Modified:
  projects/nand/usr.sbin/nandsim/nandsim.c
  projects/nand/usr.sbin/nandsim/nandsim_cfgparse.c

Modified: projects/nand/usr.sbin/nandsim/nandsim.c
==============================================================================
--- projects/nand/usr.sbin/nandsim/nandsim.c	Thu May 17 07:00:51 2012	(r235531)
+++ projects/nand/usr.sbin/nandsim/nandsim.c	Thu May 17 07:05:48 2012	(r235532)
@@ -330,7 +330,7 @@ cmdstatus(int gargc, char **gargv)
 		}
 	}
 	close(fd);
-	return(EX_OK);
+	return (err);
 }
 
 static int
@@ -644,6 +644,7 @@ cmdbb(int gargc, char **gargv)
 			err = ioctl(fd, NANDSIM_GET_BLOCK_STATE, &bs);
 			if (err) {
 				error("Could not acquire block state");
+				err = EX_SOFTWARE;
 				continue;
 			}
 			printf("Block#%d: wear count: %d %s\n", blkidx,
@@ -652,7 +653,7 @@ cmdbb(int gargc, char **gargv)
 		}
 	}
 	close(fd);
-	return (0);
+	return (err);
 }
 
 static int
@@ -1139,8 +1140,8 @@ cmddestroy(int gargc __unused, char **ga
 				continue;
 			}
 		}
+		close(fd);
 	}
-	close(fd);
 	return (err);
 }
 

Modified: projects/nand/usr.sbin/nandsim/nandsim_cfgparse.c
==============================================================================
--- projects/nand/usr.sbin/nandsim/nandsim_cfgparse.c	Thu May 17 07:00:51 2012	(r235531)
+++ projects/nand/usr.sbin/nandsim/nandsim_cfgparse.c	Thu May 17 07:05:48 2012	(r235532)
@@ -216,6 +216,9 @@ parse_intarray(char *array, int **buffer
 		tmpstr = (char *)strtok(NULL, ",");
 	}
 
+	if (count == 0)
+		goto out;
+
 	/* Allocate buffer of ints */
 	tmpstr = (char *)strtok(origstr, ",");
 	*buffer = malloc(count * sizeof(int));
@@ -237,6 +240,7 @@ parse_intarray(char *array, int **buffer
 		(*buffer)[currbufp++] = from;
 		tmpstr = (char *)strtok(NULL, ",");
 	}
+out:
 	free(origstr);
 	return (count);
 }
@@ -380,7 +384,7 @@ destroy_ctrls(struct sim_ctrl *ctrls)
 static int
 create_chips(struct rcfile *f, struct sim_chip **chips, int *cnt)
 {
-	struct sim_chip *chipsptr = *chips;
+	struct sim_chip *chipsptr;
 	int count, i;
 
 	count = rc_getsectionscount(f, "chip");