[src/trunk]: src Switch back program version to the version of the newfs_udf/...

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

details:   https://anonhg.NetBSD.org/src/rev/fd941c296b5c
branches:  trunk
changeset: 789093:fd941c296b5c
user:      reinoud <reinoud%NetBSD.org@localhost>
date:      Tue Aug 06 13:15:30 2013 +0000

description:
Switch back program version to the version of the newfs_udf/makefs code.

While here, visit the 80 columns police :)

diffstat:

 sbin/newfs_udf/newfs_udf.c  |   6 +++---
 sbin/newfs_udf/newfs_udf.h  |  17 ++++++++---------
 sbin/newfs_udf/udf_create.c |  15 +++++----------
 usr.sbin/makefs/udf.c       |  10 ++++++----
 4 files changed, 22 insertions(+), 26 deletions(-)

diffs (133 lines):

diff -r c0ea3eed8a2d -r fd941c296b5c sbin/newfs_udf/newfs_udf.c
--- a/sbin/newfs_udf/newfs_udf.c        Tue Aug 06 12:49:13 2013 +0000
+++ b/sbin/newfs_udf/newfs_udf.c        Tue Aug 06 13:15:30 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: newfs_udf.c,v 1.16 2013/08/06 12:49:13 reinoud Exp $ */
+/* $NetBSD: newfs_udf.c,v 1.17 2013/08/06 13:15:30 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -674,10 +674,10 @@
 
        srandom((unsigned long) time(NULL));
        udf_init_create_context();
-       context.app_name  = APP_NAME;
-       context.impl_name = IMPL_NAME;
+       context.app_name         = "*NetBSD newfs";
        context.app_version_main = APP_VERSION_MAIN;
        context.app_version_sub  = APP_VERSION_SUB;
+       context.impl_name        = IMPL_NAME;
 
        /* minimum and maximum UDF versions we advise */
        context.min_udf = 0x201;
diff -r c0ea3eed8a2d -r fd941c296b5c sbin/newfs_udf/newfs_udf.h
--- a/sbin/newfs_udf/newfs_udf.h        Tue Aug 06 12:49:13 2013 +0000
+++ b/sbin/newfs_udf/newfs_udf.h        Tue Aug 06 13:15:30 2013 +0000
@@ -32,21 +32,20 @@
 #define UDF_META_PERC  20      /* picked */
 
 /* Identifying myself */
-#define APP_NAME               "*NetBSD newfs"
 #define APP_VERSION_MAIN       0
-#define APP_VERSION_SUB                4
+#define APP_VERSION_SUB                5
 #define IMPL_NAME              "*NetBSD userland UDF"
 
 
 /* global variables describing disc and format requests */
-extern int      fd;                            /* device: file descriptor */
-extern char    *dev;                           /* device: name            */
-extern struct mmc_discinfo mmc_discinfo;       /* device: disc info       */
+extern int      fd;                    /* device: file descriptor */
+extern char    *dev;                   /* device: name            */
+extern struct mmc_discinfo mmc_discinfo;/* device: disc info      */
 
-extern char    *format_str;                    /* format: string representation */
-extern int      format_flags;                  /* format: attribute flags       */
-extern int      media_accesstype;              /* derived from current mmc cap  */
-extern int      check_surface;                 /* for rewritables               */
+extern char    *format_str;            /* format: string representation */
+extern int      format_flags;          /* format: attribute flags       */
+extern int      media_accesstype;      /* derived from current mmc cap  */
+extern int      check_surface;         /* for rewritables               */
 
 extern int      wrtrack_skew;
 extern int      meta_perc;
diff -r c0ea3eed8a2d -r fd941c296b5c sbin/newfs_udf/udf_create.c
--- a/sbin/newfs_udf/udf_create.c       Tue Aug 06 12:49:13 2013 +0000
+++ b/sbin/newfs_udf/udf_create.c       Tue Aug 06 13:15:30 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf_create.c,v 1.21 2013/08/06 12:49:13 reinoud Exp $ */
+/* $NetBSD: udf_create.c,v 1.22 2013/08/06 13:15:30 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008 Reinoud Zandijk
@@ -30,7 +30,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: udf_create.c,v 1.21 2013/08/06 12:49:13 reinoud Exp $");
+__RCSID("$NetBSD: udf_create.c,v 1.22 2013/08/06 13:15:30 reinoud Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -77,16 +77,11 @@
        context.volset_name  = NULL;
        context.fileset_name = NULL;
 
-#ifdef __NetBSD_Version__
-       context.app_name          = "*NetBSD newfs";
-       context.app_version_main =  __NetBSD_Version__ / 100000000;
-       context.app_version_sub  = (__NetBSD_Version__ / 1000000) % 100;
-#else
-       context.app_name          = "*NetBSD makefs";
+       /* most basic identification */
+       context.app_name         = "*NetBSD";
        context.app_version_main = 0;
        context.app_version_sub  = 0;
-#endif
-       context.impl_name        = "*NetBSD kernel UDF";
+       context.impl_name        = "*NetBSD";
 
        context.vds_seq = 0;            /* first one starts with zero */
 
diff -r c0ea3eed8a2d -r fd941c296b5c usr.sbin/makefs/udf.c
--- a/usr.sbin/makefs/udf.c     Tue Aug 06 12:49:13 2013 +0000
+++ b/usr.sbin/makefs/udf.c     Tue Aug 06 13:15:30 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: udf.c,v 1.9 2013/08/06 12:47:21 reinoud Exp $ */
+/* $NetBSD: udf.c,v 1.10 2013/08/06 13:15:30 reinoud Exp $ */
 
 /*
  * Copyright (c) 2006, 2008, 2013 Reinoud Zandijk
@@ -30,7 +30,7 @@
 #endif
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: udf.c,v 1.9 2013/08/06 12:47:21 reinoud Exp $");
+__RCSID("$NetBSD: udf.c,v 1.10 2013/08/06 13:15:30 reinoud Exp $");
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -58,6 +58,8 @@
 #include "udf_write.h"
 #include "newfs_udf.h"
 
+#undef APP_NAME
+#define APP_NAME "*NetBSD makefs"
 
 /*
  * Note: due to the setup of the newfs code, the current state of the program
@@ -314,10 +316,10 @@
        mmc_profile = 0x01;             /* 'disc'/file */
 
        udf_init_create_context();
-       context.app_name  = APP_NAME;
-       context.impl_name = IMPL_NAME;
+       context.app_name         = "*NetBSD makefs";
        context.app_version_main = APP_VERSION_MAIN;
        context.app_version_sub  = APP_VERSION_SUB;
+       context.impl_name        = IMPL_NAME;
 
        /* minimum and maximum UDF versions we advise */
        context.min_udf = 0x102;