[src/trunk]: src/usr.sbin/mtree our fts compare routine is less constified.

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/d6fd3843b206
branches:  trunk
changeset: 781870:d6fd3843b206
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Oct 05 00:58:46 2012 +0000

description:
our fts compare routine is less constified.

diffstat:

 usr.sbin/mtree/create.c |  44 ++++++++++++++++++++++++++++----------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diffs (107 lines):

diff -r 47c31e3adaae -r d6fd3843b206 usr.sbin/mtree/create.c
--- a/usr.sbin/mtree/create.c   Fri Oct 05 00:42:00 2012 +0000
+++ b/usr.sbin/mtree/create.c   Fri Oct 05 00:58:46 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: create.c,v 1.60 2012/10/05 00:41:24 christos Exp $     */
+/*     $NetBSD: create.c,v 1.61 2012/10/05 00:58:46 christos Exp $     */
 
 /*-
  * Copyright (c) 1989, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)create.c   8.1 (Berkeley) 6/6/93";
 #else
-__RCSID("$NetBSD: create.c,v 1.60 2012/10/05 00:41:24 christos Exp $");
+__RCSID("$NetBSD: create.c,v 1.61 2012/10/05 00:58:46 christos Exp $");
 #endif
 #endif /* not lint */
 
@@ -83,7 +83,13 @@
 static mode_t mode;
 static u_long flags;
 
-static int     dcmp(const FTSENT *const *, const FTSENT *const *);
+#ifdef __FreeBSD__
+#define        FTS_CONST const
+#else
+#define        FTS_CONST
+#endif
+
+static int     dcmp(const FTSENT *FTS_CONST *, const FTSENT *FTS_CONST *);
 static void    output(int *, const char *, ...)
        __attribute__((__format__(__printf__, 2, 3)));
 static int     statd(FTS *, FTSENT *, uid_t *, gid_t *, mode_t *, u_long *);
@@ -214,46 +220,52 @@
 #ifndef NO_MD5
        if (keys & F_MD5 && S_ISREG(p->fts_statp->st_mode)) {
                if ((digestbuf = MD5File(p->fts_accpath, NULL)) == NULL)
-                       mtree_err("%s: MD5File failed: %s", p->fts_accpath, strerror(errno));
-               output(&indent, "md5=%s", digestbuf);
+                       mtree_err("%s: MD5File failed: %s", p->fts_accpath,
+                           strerror(errno));
+               output(&indent, "%s=%s", MD5KEY, digestbuf);
                free(digestbuf);
        }
 #endif /* ! NO_MD5 */
 #ifndef NO_RMD160
        if (keys & F_RMD160 && S_ISREG(p->fts_statp->st_mode)) {
                if ((digestbuf = RMD160File(p->fts_accpath, NULL)) == NULL)
-                       mtree_err("%s: RMD160File failed: %s", p->fts_accpath, strerror(errno));
-               output(&indent, "rmd160=%s", digestbuf);
+                       mtree_err("%s: RMD160File failed: %s", p->fts_accpath,
+                           strerror(errno));
+               output(&indent, "%s=%s", RMD160KEY, digestbuf);
                free(digestbuf);
        }
 #endif /* ! NO_RMD160 */
 #ifndef NO_SHA1
        if (keys & F_SHA1 && S_ISREG(p->fts_statp->st_mode)) {
                if ((digestbuf = SHA1File(p->fts_accpath, NULL)) == NULL)
-                       mtree_err("%s: SHA1File failed: %s", p->fts_accpath, strerror(errno));
-               output(&indent, "sha1=%s", digestbuf);
+                       mtree_err("%s: SHA1File failed: %s", p->fts_accpath,
+                           strerror(errno));
+               output(&indent, "%s=%s", SHA1KEY, digestbuf);
                free(digestbuf);
        }
 #endif /* ! NO_SHA1 */
 #ifndef NO_SHA2
        if (keys & F_SHA256 && S_ISREG(p->fts_statp->st_mode)) {
                if ((digestbuf = SHA256_File(p->fts_accpath, NULL)) == NULL)
-                       mtree_err("%s: SHA256_File failed: %s", p->fts_accpath, strerror(errno));
-               output(&indent, "sha256=%s", digestbuf);
+                       mtree_err("%s: SHA256_File failed: %s", p->fts_accpath,
+                           strerror(errno));
+               output(&indent, "%s=%s", SHA256KEY, digestbuf);
                free(digestbuf);
        }
 #ifdef SHA384_BLOCK_LENGTH
        if (keys & F_SHA384 && S_ISREG(p->fts_statp->st_mode)) {
                if ((digestbuf = SHA384_File(p->fts_accpath, NULL)) == NULL)
-                       mtree_err("%s: SHA384_File failed: %s", p->fts_accpath, strerror(errno));
-               output(&indent, "sha384=%s", digestbuf);
+                       mtree_err("%s: SHA384_File failed: %s", p->fts_accpath,
+                           strerror(errno));
+               output(&indent, "%s=%s", SHA384KEY, digestbuf);
                free(digestbuf);
        }
 #endif
        if (keys & F_SHA512 && S_ISREG(p->fts_statp->st_mode)) {
                if ((digestbuf = SHA512_File(p->fts_accpath, NULL)) == NULL)
-                       mtree_err("%s: SHA512_File failed: %s", p->fts_accpath, strerror(errno));
-               output(&indent, "sha512=%s", digestbuf);
+                       mtree_err("%s: SHA512_File failed: %s", p->fts_accpath,
+                           strerror(errno));
+               output(&indent, "%s=%s", SHA512KEY, digestbuf);
                free(digestbuf);
        }
 #endif /* ! NO_SHA2 */
@@ -400,7 +412,7 @@
  * Keep this in sync with nodecmp() in spec.c.
  */
 static int
-dcmp(const FTSENT *const *a, const FTSENT *const *b)
+dcmp(const FTSENT *FTS_CONST *a, const FTSENT *FTS_CONST *b)
 {
 
        if (S_ISDIR((*a)->fts_statp->st_mode)) {