From owner-p4-projects@FreeBSD.ORG  Tue Jun 18 14:22:14 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 414E8C9C; Tue, 18 Jun 2013 14:22:14 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 03AD3C9A
 for <perforce@freebsd.org>; Tue, 18 Jun 2013 14:22:14 +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 E800C1CAC
 for <perforce@freebsd.org>; Tue, 18 Jun 2013 14:22:13 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r5IEMDwr019014
 for <perforce@freebsd.org>; Tue, 18 Jun 2013 14:22:13 GMT
 (envelope-from jonathan@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r5IEMDBA019011
 for perforce@freebsd.org; Tue, 18 Jun 2013 14:22:13 GMT
 (envelope-from jonathan@freebsd.org)
Date: Tue, 18 Jun 2013 14:22:13 GMT
Message-Id: <201306181422.r5IEMDBA019011@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 229891 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:22:14 -0000

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

Change 229891 by jonathan@jonathan-on-joe on 2013/06/18 14:21:41

	If the first tesla_store_get() call fails, it deserves an assert() rather than just a return (the new error-handling path only applies when we have a tesla_class*, which we don't yet here).

Affected files ...

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

Differences ...

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

@@ -46,7 +46,6 @@
 	const char *name, const char *description,
 	const struct tesla_transitions *trans)
 {
-	int err;
 
 	if (tesla_debugging(DEBUG_NAME)) {
 		/* We should never see with multiple <<init>> transitions. */
@@ -73,15 +72,13 @@
 	PRINT("\n----\n");
 
 	struct tesla_store *store;
-	err = tesla_store_get(tesla_context, TESLA_MAX_CLASSES,
-			TESLA_MAX_INSTANCES, &store);
-	if (err != TESLA_SUCCESS)
-		return;
+	assert(tesla_store_get(tesla_context, TESLA_MAX_CLASSES,
+			TESLA_MAX_INSTANCES, &store) == TESLA_SUCCESS);
 
 	PRINT("store: 0x%tx\n", (intptr_t) store);
 
 	struct tesla_class *class;
-	err = tesla_class_get(store, class_id, &class, name, description);
+	int err = tesla_class_get(store, class_id, &class, name, description);
 	if (err != TESLA_SUCCESS)
 		return;