[Midnightbsd-cvs] src [7155] trunk/usr.bin/sort: cleanup some headers

[laffer1 at midnightbsd.org]

Revision: 7155
          http://svnweb.midnightbsd.org/src/?rev=7155
Author:   laffer1
Date:     2015-07-26 13:05:25 -0400 (Sun, 26 Jul 2015)
Log Message:
-----------
cleanup some headers

Modified Paths:
--------------
    trunk/usr.bin/sort/mem.h
    trunk/usr.bin/sort/vsort.c
    trunk/usr.bin/sort/vsort.h

Modified: trunk/usr.bin/sort/mem.h
===================================================================
--- trunk/usr.bin/sort/mem.h	2015-07-26 17:05:13 UTC (rev 7154)
+++ trunk/usr.bin/sort/mem.h	2015-07-26 17:05:25 UTC (rev 7155)
@@ -1,8 +1,8 @@
-/*	$FreeBSD: src/usr.bin/sort/mem.h,v 1.1 2012/05/11 12:37:16 gabor Exp $	*/
+/*	$FreeBSD: stable/10/usr.bin/sort/mem.h 265160 2014-04-30 20:39:08Z pfg $	*/
 
 /*-
  * Copyright (C) 2009 Gabor Kovesdan <gabor at FreeBSD.org>
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko at citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267 at gmail.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
  */
 
 #if !defined(__SORT_MEM_H__)
-#define __SORT_MEM_H__
+#define	__SORT_MEM_H__
 
 #include <errno.h>
 #include <stdbool.h>

Modified: trunk/usr.bin/sort/vsort.c
===================================================================
--- trunk/usr.bin/sort/vsort.c	2015-07-26 17:05:13 UTC (rev 7154)
+++ trunk/usr.bin/sort/vsort.c	2015-07-26 17:05:25 UTC (rev 7155)
@@ -1,5 +1,5 @@
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko at citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267 at gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor at FreeBSD.org>
  * All rights reserved.
  *
@@ -26,7 +26,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/usr.bin/sort/vsort.c,v 1.1 2012/05/11 12:37:16 gabor Exp $");
+__FBSDID("$FreeBSD: stable/10/usr.bin/sort/vsort.c 251245 2013-06-02 09:43:48Z gabor $");
 
 #include <sys/types.h>
 

Modified: trunk/usr.bin/sort/vsort.h
===================================================================
--- trunk/usr.bin/sort/vsort.h	2015-07-26 17:05:13 UTC (rev 7154)
+++ trunk/usr.bin/sort/vsort.h	2015-07-26 17:05:25 UTC (rev 7155)
@@ -1,7 +1,7 @@
-/*	$FreeBSD: src/usr.bin/sort/vsort.h,v 1.1 2012/05/11 12:37:16 gabor Exp $	*/
+/*	$FreeBSD: stable/10/usr.bin/sort/vsort.h 265160 2014-04-30 20:39:08Z pfg $	*/
 
 /*-
- * Copyright (C) 2012 Oleg Moskalenko <oleg.moskalenko at citrix.com>
+ * Copyright (C) 2012 Oleg Moskalenko <mom040267 at gmail.com>
  * Copyright (C) 2012 Gabor Kovesdan <gabor at FreeBSD.org>
  * All rights reserved.
  *
@@ -27,8 +27,8 @@
  * SUCH DAMAGE.
  */
 
-#if !defined(__VSORT_H__)
-#define _VSORT_H__
+#ifndef _VSORT_H_
+#define	_VSORT_H_
 
 #include "bwstring.h"