From owner-p4-projects@FreeBSD.ORG  Thu Nov 29 19:37:56 2012
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 3A5D93D9; Thu, 29 Nov 2012 19:37:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id D78FF3D7
 for <perforce@freebsd.org>; Thu, 29 Nov 2012 19:37:55 +0000 (UTC)
 (envelope-from brooks@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:4f8:fff6::2d])
 by mx1.freebsd.org (Postfix) with ESMTP id BDDE48FC12
 for <perforce@freebsd.org>; Thu, 29 Nov 2012 19:37:55 +0000 (UTC)
Received: from skunkworks.freebsd.org (localhost [127.0.0.1])
 by skunkworks.freebsd.org (8.14.5/8.14.5) with ESMTP id qATJbtlP046670
 for <perforce@freebsd.org>; Thu, 29 Nov 2012 19:37:55 GMT
 (envelope-from brooks@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.5/8.14.5/Submit) id qATJbtVd046667
 for perforce@freebsd.org; Thu, 29 Nov 2012 19:37:55 GMT
 (envelope-from brooks@freebsd.org)
Date: Thu, 29 Nov 2012 19:37:55 GMT
Message-Id: <201211291937.qATJbtVd046667@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 brooks@freebsd.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Subject: PERFORCE change 219864 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: Thu, 29 Nov 2012 19:37:56 -0000

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

Change 219864 by brooks@brooks_zenith on 2012/11/29 19:37:25

	Add a couple more #ifndef COMPILE_ONLY statements so the
	compiler doesn't complain about mlist_insert() being unused.

Affected files ...

.. //depot/projects/ctsrd/cheribsd/src/contrib/file/apprentice.c#4 edit

Differences ...

==== //depot/projects/ctsrd/cheribsd/src/contrib/file/apprentice.c#4 (text+ko) ====

@@ -110,11 +110,11 @@
     const char *);
 private int apprentice_map(struct magic_set *, struct magic **, uint32_t *,
     const char *);
+private int mlist_insert(struct magic_set *, struct mlist *, struct magic *,
+    uint32_t, int);
 #endif
 private int apprentice_compile(struct magic_set *, struct magic **, uint32_t *,
     const char *);
-private int mlist_insert(struct magic_set *, struct mlist *, struct magic *,
-    uint32_t, int);
 private int check_format_type(const char *, int);
 private int check_format(struct magic_set *, struct magic *);
 private int get_op(char);
@@ -319,6 +319,7 @@
 	return 0;
 }
 
+#ifndef COMPILE_ONLY
 private int
 mlist_insert(struct magic_set *ms, struct mlist *mlist, struct magic *magic,
     uint32_t nmagic, int mapped)
@@ -342,6 +343,7 @@
 
 	return 0;
 }
+#endif
 
 protected void
 file_delmagic(struct magic *p, int type, size_t entries)