[Midnightbsd-cvs] src [10894] U trunk/usr.bin/units/units.lib: sync with freebsd

[laffer1 at midnightbsd.org]

Revision: 10894
          http://svnweb.midnightbsd.org/src/?rev=10894
Author:   laffer1
Date:     2018-06-13 22:27:16 -0400 (Wed, 13 Jun 2018)
Log Message:
-----------
sync with freebsd

Modified Paths:
--------------
    trunk/usr.bin/units/units.1
    trunk/usr.bin/units/units.c

Property Changed:
----------------
    trunk/usr.bin/units/README
    trunk/usr.bin/units/units.1
    trunk/usr.bin/units/units.lib

Index: trunk/usr.bin/units/README
===================================================================
--- trunk/usr.bin/units/README	2018-06-14 00:19:29 UTC (rev 10893)
+++ trunk/usr.bin/units/README	2018-06-14 02:27:16 UTC (rev 10894)

Property changes on: trunk/usr.bin/units/README
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/units/units.1
===================================================================
--- trunk/usr.bin/units/units.1	2018-06-14 00:19:29 UTC (rev 10893)
+++ trunk/usr.bin/units/units.1	2018-06-14 02:27:16 UTC (rev 10894)
@@ -1,4 +1,5 @@
 .\" $MidnightBSD$
+.\" $FreeBSD: stable/10/usr.bin/units/units.1 233510 2012-03-26 15:18:14Z joel $
 .Dd July 14, 1993
 .Dt UNITS 1
 .Os
@@ -95,15 +96,15 @@
 Some constants of nature included are:
 .Pp
 .Bl -column -offset indent -compact "mercury"
-.It "pi	ratio of circumference to diameter
-.It "c	speed of light
-.It "e	charge on an electron
-.It "g	acceleration of gravity
-.It "force	same as g
-.It "mole	Avogadro's number
-.It "water	pressure per unit height of water
-.It "mercury	pressure per unit height of mercury
-.It "au	astronomical unit
+.It "pi	ratio of circumference to diameter"
+.It "c	speed of light"
+.It "e	charge on an electron"
+.It "g	acceleration of gravity"
+.It "force	same as g"
+.It "mole	Avogadro's number"
+.It "water	pressure per unit height of water"
+.It "mercury	pressure per unit height of mercury"
+.It "au	astronomical unit"
 .El
 .Pp
 The unit 'pound' is a unit of mass.
@@ -148,14 +149,14 @@
 units.
 .Pp
 .Bl -column -offset indent -compact "minute"
-.It "m	!a!
-.It "sec	!b!
-.It "micro-	1e-6
-.It "minute	60 sec
-.It "hour	60 min
-.It "inch	0.0254 m
-.It "ft	12 inches
-.It "mile	5280 ft
+.It "m	!a!"
+.It "sec	!b!"
+.It "micro-	1e-6"
+.It "minute	60 sec"
+.It "hour	60 min"
+.It "inch	0.0254 m"
+.It "ft	12 inches"
+.It "mile	5280 ft"
 .El
 .Sh FILES
 .Bl -tag -width /usr/share/misc/units.lib -compact


Property changes on: trunk/usr.bin/units/units.1
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Modified: trunk/usr.bin/units/units.c
===================================================================
--- trunk/usr.bin/units/units.c	2018-06-14 00:19:29 UTC (rev 10893)
+++ trunk/usr.bin/units/units.c	2018-06-14 02:27:16 UTC (rev 10894)
@@ -1,3 +1,4 @@
+/* $MidnightBSD$ */
 /*
  * units.c   Copyright (c) 1993 by Adrian Mariano (adrian at cam.cornell.edu)
  *
@@ -17,7 +18,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-  "$MidnightBSD$";
+  "$FreeBSD: stable/10/usr.bin/units/units.c 227194 2011-11-06 08:18:17Z ed $";
 #endif /* not lint */
 
 #include <ctype.h>
@@ -42,9 +43,9 @@
 
 #define PRIMITIVECHAR '!'
 
-const char *powerstring = "^";
+static const char *powerstring = "^";
 
-struct {
+static struct {
 	char *uname;
 	char *uval;
 }      unittable[MAXUNITS];
@@ -57,13 +58,13 @@
 	int quantity;
 };
 
-struct {
+static struct {
 	char *prefixname;
 	char *prefixval;
 }      prefixtable[MAXPREFIXES];
 
 
-char NULLUNIT[] = "";
+static char NULLUNIT[] = "";
 
 #ifdef MSDOS
 #define SEPARATOR      ";"
@@ -71,8 +72,8 @@
 #define SEPARATOR      ":"
 #endif
 
-int unitcount;
-int prefixcount;
+static int unitcount;
+static int prefixcount;
 
 char	*dupstr(const char *str);
 void	 readunits(const char *userfile);

Index: trunk/usr.bin/units/units.lib
===================================================================
--- trunk/usr.bin/units/units.lib	2018-06-14 00:19:29 UTC (rev 10893)
+++ trunk/usr.bin/units/units.lib	2018-06-14 02:27:16 UTC (rev 10894)

Property changes on: trunk/usr.bin/units/units.lib
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property