From owner-p4-projects@FreeBSD.ORG  Tue Jun 18 14:24:16 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 991D9DBF; Tue, 18 Jun 2013 14:24:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 5A632DBD
 for <perforce@freebsd.org>; Tue, 18 Jun 2013 14:24:16 +0000 (UTC)
 (envelope-from jonathan@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks6.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 495D21CCC
 for <perforce@freebsd.org>; Tue, 18 Jun 2013 14:24:16 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IEOG67019166
 for <perforce@freebsd.org>; Tue, 18 Jun 2013 14:24:16 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5IEOGVg019163
 for perforce@freebsd.org; Tue, 18 Jun 2013 14:24:16 GMT
 (envelope-from jonathan@freebsd.org)
Date: Tue, 18 Jun 2013 14:24:16 GMT
Message-Id: <201306181424.r5IEOGVg019163@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jonathan@freebsd.org using -f
From: Jonathan Anderson <jonathan@FreeBSD.org>
Subject: PERFORCE change 229892 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jun 2013 14:24:16 -0000

http://p4web.freebsd.org/@@229892?ac=10

Change 229892 by jonathan@jonathan-on-joe on 2013/06/18 14:23:32

	As for the last change, use assert() for failures in finding the relevant tesla_class*.

Affected files ...

.. //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_update.c#8 edit

Differences ...

==== //depot/projects/ctsrd/tesla/src/sys/contrib/tesla/libtesla/tesla_update.c#8 (text+ko) ====

@@ -78,9 +78,8 @@
 	PRINT("store: 0x%tx\n", (intptr_t) store);
 
 	struct tesla_class *class;
-	int err = tesla_class_get(store, class_id, &class, name, description);
-	if (err != TESLA_SUCCESS)
-		return;
+	assert(tesla_class_get(store, class_id, &class, name, description)
+		== TESLA_SUCCESS);
 
 	print_class(class);
 
@@ -99,6 +98,7 @@
 	} clones[max_clones];
 
 	// Iterate over existing instances, figure out what to do with each.
+	int err = TESLA_SUCCESS;
 	for (uint32_t i = 0; i < class->tc_limit; i++) {
 		assert(class->tc_instances != NULL);
 		tesla_instance *inst = class->tc_instances + i;