PERFORCE change 219864 for review

[Brooks Davis]

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

Change 219864 by brooks at 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)