Fix the style of the SCM ID's.

I believe have made all of libc .c's as consistent as possible.

7 files changed, 18 insertions, 25 deletions

diff --git a/lib/libc/stdtime/asctime.c b/lib/libc/stdtime/asctime.c
index 06df9a7..49cbc1d 100644
--- a/lib/libc/stdtime/asctime.c
+++ b/lib/libc/stdtime/asctime.c
@@ -1,8 +1,6 @@
 /*
 ** This file is in the public domain, so clarified as of
 ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
-*
-* $FreeBSD$
 */
 
 #ifndef lint
@@ -10,6 +8,8 @@
 static char	elsieid[] = "@(#)asctime.c	7.7";
 #endif /* !defined NOID */
 #endif /* !defined lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*LINTLIBRARY*/
 
diff --git a/lib/libc/stdtime/difftime.c b/lib/libc/stdtime/difftime.c
index 64a5ea2..59368e4 100644
--- a/lib/libc/stdtime/difftime.c
+++ b/lib/libc/stdtime/difftime.c
@@ -1,8 +1,6 @@
 /*
 ** This file is in the public domain, so clarified as of
 ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
-*
-* $FreeBSD$
 */
 
 #ifndef lint
@@ -10,6 +8,8 @@
 static char	elsieid[] = "@(#)difftime.c	7.7";
 #endif /* !defined NOID */
 #endif /* !defined lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*LINTLIBRARY*/
 
diff --git a/lib/libc/stdtime/localtime.c b/lib/libc/stdtime/localtime.c
index 28a7b68..09cfd3f 100644
--- a/lib/libc/stdtime/localtime.c
+++ b/lib/libc/stdtime/localtime.c
@@ -1,8 +1,6 @@
 /*
 ** This file is in the public domain, so clarified as of
 ** June 5, 1996 by Arthur David Olson (arthur_david_olson@nih.gov).
-**
-** $FreeBSD$
 */
 
 #ifndef lint
@@ -10,6 +8,8 @@
 static char	elsieid[] = "@(#)localtime.c	7.57";
 #endif /* !defined NOID */
 #endif /* !defined lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 /*
 ** Leap second handling from Bradley White (bww@k.gp.cs.cmu.edu).
diff --git a/lib/libc/stdtime/strftime.c b/lib/libc/stdtime/strftime.c
index 72f67d4..29401bb 100644
--- a/lib/libc/stdtime/strftime.c
+++ b/lib/libc/stdtime/strftime.c
@@ -15,11 +15,6 @@
  * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
-#ifdef LIBC_RCS
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 #ifndef lint
 #ifndef NOID
 static const char	elsieid[] = "@(#)strftime.c	7.38";
@@ -33,11 +28,11 @@ static const char	elsieid[] = "@(#)strftime.c	7.38";
 #include "namespace.h"
 #include "private.h"
 
-#ifndef LIBC_SCCS
-#ifndef lint
+#if defined(LIBC_SCCS) && !defined(lint)
 static const char	sccsid[] = "@(#)strftime.c	5.4 (Berkeley) 3/14/89";
-#endif /* !defined lint */
-#endif /* !defined LIBC_SCCS */
+#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "tzfile.h"
 #include <fcntl.h>
diff --git a/lib/libc/stdtime/strptime.c b/lib/libc/stdtime/strptime.c
index bcda42b..b050f1a 100644
--- a/lib/libc/stdtime/strptime.c
+++ b/lib/libc/stdtime/strptime.c
@@ -51,11 +51,6 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef LIBC_RCS
-static const char rcsid[] =
-  "$FreeBSD$";
-#endif
-
 #ifndef lint
 #ifndef NOID
 static char copyright[] =
@@ -63,6 +58,8 @@ static char copyright[] =
 static char sccsid[] = "@(#)strptime.c	0.1 (Powerdog) 94/03/27";
 #endif /* !defined NOID */
 #endif /* not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
 
 #include "namespace.h"
 #include <time.h>
diff --git a/lib/libc/stdtime/time32.c b/lib/libc/stdtime/time32.c
index 34174c5..9040fdc 100644
--- a/lib/libc/stdtime/time32.c
+++ b/lib/libc/stdtime/time32.c
@@ -9,10 +9,11 @@
  *
  * Redistribution and use under the terms of the COPYRIGHT file at the
  * base of the source tree.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/types.h>
 #include <sys/time.h>
 
@@ -97,4 +98,3 @@ _int_to_time(int tint)
 	return(_time32_to_time(tint));
     return((time_t)tint);
 }
-
diff --git a/lib/libc/stdtime/timelocal.c b/lib/libc/stdtime/timelocal.c
index 48c4b8a..e1fffcb 100644
--- a/lib/libc/stdtime/timelocal.c
+++ b/lib/libc/stdtime/timelocal.c
@@ -23,10 +23,11 @@
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
- *
- * $FreeBSD$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <stddef.h>
 
 #include "ldpart.h"