svn commit: r210761 - head/contrib/file

[Rui Paulo]

Author: rpaulo
Date: Mon Aug  2 13:05:12 2010
New Revision: 210761
URL: http://svn.freebsd.org/changeset/base/210761

Log:
  Properly warp around more code under COMPILE_ONLY to recover from build
  errors.

Modified:
  head/contrib/file/apprentice.c
  head/contrib/file/magic.c

Modified: head/contrib/file/apprentice.c
==============================================================================
--- head/contrib/file/apprentice.c	Mon Aug  2 13:00:43 2010	(r210760)
+++ head/contrib/file/apprentice.c	Mon Aug  2 13:05:12 2010	(r210761)
@@ -99,14 +99,18 @@ private size_t apprentice_magic_strength
 private int apprentice_sort(const void *, const void *);
 private int apprentice_load(struct magic_set *, struct magic **, uint32_t *,
     const char *, int);
+#ifndef COMPILE_ONLY
 private void byteswap(struct magic *, uint32_t);
 private void bs1(struct magic *);
 private uint16_t swap2(uint16_t);
 private uint32_t swap4(uint32_t);
 private uint64_t swap8(uint64_t);
+#endif
 private char *mkdbname(struct magic_set *, const char *, int);
+#ifndef COMPILE_ONLY
 private int apprentice_map(struct magic_set *, struct magic **, uint32_t *,
     const char *);
+#endif
 private int apprentice_compile(struct magic_set *, struct magic **, uint32_t *,
     const char *);
 private int check_format_type(const char *, int);
@@ -263,9 +267,13 @@ apprentice_1(struct magic_set *ms, const
 {
 	struct magic *magic = NULL;
 	uint32_t nmagic = 0;
+#ifndef COMPILE_ONLY
 	struct mlist *ml;
+#endif
 	int rv = -1;
+#ifndef COMPILE_ONLY
 	int mapped;
+#endif
 
 	if (magicsize != FILE_MAGICSIZE) {
 		file_error(ms, 0, "magic element size %lu != %lu",
@@ -314,8 +322,8 @@ apprentice_1(struct magic_set *ms, const
 	ml->next = mlist;
 	mlist->prev = ml;
 
-	return 0;
 #endif /* COMPILE_ONLY */
+	return 0;
 }
 
 protected void
@@ -2053,6 +2061,7 @@ eatsize(const char **p)
 	*p = l;
 }
 
+#ifndef COMPILE_ONLY
 /*
  * handle a compiled file.
  */
@@ -2150,6 +2159,7 @@ error2:
 	free(dbname);
 	return -1;
 }
+#endif /* COMPILE_ONLY */
 
 private const uint32_t ar[] = {
     MAGICNO, VERSIONNO
@@ -2244,6 +2254,7 @@ mkdbname(struct magic_set *ms, const cha
 	return buf;
 }
 
+#ifndef COMPILE_ONLY
 /*
  * Byteswap an mmap'ed file if needed
  */
@@ -2335,3 +2346,4 @@ bs1(struct magic *m)
 		m->num_mask = swap8(m->num_mask);
 	}
 }
+#endif /* COMPILE_ONLY */

Modified: head/contrib/file/magic.c
==============================================================================
--- head/contrib/file/magic.c	Mon Aug  2 13:00:43 2010	(r210760)
+++ head/contrib/file/magic.c	Mon Aug  2 13:05:12 2010	(r210761)
@@ -71,10 +71,10 @@ FILE_RCSID("@(#)$File: magic.c,v 1.62 20
 #endif
 
 private void free_mlist(struct mlist *);
+#ifndef COMPILE_ONLY
 private void close_and_restore(const struct magic_set *, const char *, int,
     const struct stat *);
 private int unreadable_info(struct magic_set *, mode_t, const char *);
-#ifndef COMPILE_ONLY
 private const char *file_or_fd(struct magic_set *, const char *, int);
 #endif
 
@@ -132,6 +132,7 @@ free_mlist(struct mlist *mlist)
 	free(ml);
 }
 
+#ifndef COMPILE_ONLY
 private int
 unreadable_info(struct magic_set *ms, mode_t md, const char *file)
 {
@@ -149,6 +150,7 @@ unreadable_info(struct magic_set *ms, mo
 		return -1;
 	return 0;
 }
+#endif
 
 public void
 magic_close(struct magic_set *ms)
@@ -191,6 +193,7 @@ magic_check(struct magic_set *ms, const 
 	return ml ? 0 : -1;
 }
 
+#ifndef COMPILE_ONLY
 private void
 close_and_restore(const struct magic_set *ms, const char *name, int fd,
     const struct stat *sb)
@@ -224,7 +227,6 @@ close_and_restore(const struct magic_set
 	}
 }
 
-#ifndef COMPILE_ONLY
 
 /*
  * find type of descriptor
@@ -352,7 +354,7 @@ magic_buffer(struct magic_set *ms, const
 	}
 	return file_getbuffer(ms);
 }
-#endif
+#endif /* COMPILE_ONLY */
 
 public const char *
 magic_error(struct magic_set *ms)