Adjust most C source files to match the new standards for copyright

and license comments.

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@24695 dc483132-0cff-0310-8789-dd5450dbe970

12 files changed, 38 insertions, 55 deletions

diff --git a/src/util/support/ipc_stream.c b/src/util/support/ipc_stream.c
index 2cea709ab..72d307054 100644
--- a/src/util/support/ipc_stream.c
+++ b/src/util/support/ipc_stream.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/ipc_stream.c */
 /*
- * $Header$
- *
  * Copyright 2006, 2007, 2009 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
diff --git a/src/util/support/k5buf-int.h b/src/util/support/k5buf-int.h
index 616cee50a..cc3c04c6e 100644
--- a/src/util/support/k5buf-int.h
+++ b/src/util/support/k5buf-int.h
@@ -1,8 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-
+/* util/support/k5buf-int.h */
 /*
- * k5buf-int.h
- *
  * Copyright 2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,10 +22,10 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- * Internal declarations for the k5buf string buffer module.
  */
 
+/* Internal declarations for the k5buf string buffer module */
+
 #ifndef K5BUF_INT_H
 #define K5BUF_INT_H
 
diff --git a/src/util/support/k5buf.c b/src/util/support/k5buf.c
index 799c9f94d..5040dedd1 100644
--- a/src/util/support/k5buf.c
+++ b/src/util/support/k5buf.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/k5buf.c */
 /*
- * k5buf.c
- *
  * Copyright 2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,10 +22,10 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- * Implement the k5buf string buffer module.
  */
 
+/* Implement the k5buf string buffer module. */
+
 /* Can't include krb5.h here, or k5-int.h which includes it, because
    krb5.h needs to be generated with error tables, after util/et,
    which builds after this directory.  */
diff --git a/src/util/support/plugins.c b/src/util/support/plugins.c
index 4e9225407..c1520568a 100644
--- a/src/util/support/plugins.c
+++ b/src/util/support/plugins.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/plugins.c - Plugin module support functions */
 /*
- * util/support/plugins.c
- *
  * Copyright 2006, 2008 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -23,9 +22,6 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * Plugin module support, and shims around dlopen/whatever.
  */
 
 #include "k5-plugin.h"
diff --git a/src/util/support/printf.c b/src/util/support/printf.c
index b3cf46b38..8228a4004 100644
--- a/src/util/support/printf.c
+++ b/src/util/support/printf.c
@@ -1,9 +1,8 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/printf.c */
 /*
- * printf.c
- *
- * Copyright 2003, 2004, 2005, 2007, 2008 Massachusetts Institute of Technology.
- * All Rights Reserved.
+ * Copyright 2003, 2004, 2005, 2007, 2008 Massachusetts Institute of
+ * Technology.  All Rights Reserved.
  *
  * Export of this software from the United States of America may
  *   require a specific license from the United States Government.
@@ -23,11 +22,10 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * Provide {,v}asprintf for platforms that don't have them.
  */
 
+/* Provide {,v}asprintf for platforms that don't have them. */
+
 #include "k5-platform.h"
 
 /* On error: BSD: Set *ret to NULL.  GNU: *ret is undefined.
diff --git a/src/util/support/strlcpy.c b/src/util/support/strlcpy.c
index a3abbfec9..26ac34eff 100644
--- a/src/util/support/strlcpy.c
+++ b/src/util/support/strlcpy.c
@@ -1,8 +1,4 @@
 /* -*- mode: c; c-file-style: "bsd"; indent-tabs-mode: t -*- */
-#include "k5-platform.h"
-
-/* Provide strlcpy and strlcat for platforms that don't have them. */
-
 /*
  * Copyright (c) 1998 Todd C. Miller <Todd.Miller@courtesan.com>
  *
@@ -19,6 +15,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+/* Provide strlcpy and strlcat for platforms that don't have them. */
+
+#include "k5-platform.h"
 #include <sys/types.h>
 #include <string.h>
 
diff --git a/src/util/support/supp-int.h b/src/util/support/supp-int.h
index cf8c2888f..5cd030e47 100644
--- a/src/util/support/supp-int.h
+++ b/src/util/support/supp-int.h
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/supp-int.h */
 /*
- * util/support/supp-int.h
- *
  * Copyright (C) 2006 by the Massachusetts Institute of Technology.
  * All rights reserved.
  *
@@ -23,7 +22,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
+ */
+
+/*
  *
  *  Internal prototypes for the krb5support library
  */
diff --git a/src/util/support/t_k5buf.c b/src/util/support/t_k5buf.c
index a74ad858c..a6195fcec 100644
--- a/src/util/support/t_k5buf.c
+++ b/src/util/support/t_k5buf.c
@@ -1,8 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-
+/* util/support/t_k5buf.c - Test the k5buf string buffer module */
 /*
- * t_k5buf.c
- *
  * Copyright 2008 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,8 +22,6 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- * Test the k5buf string buffer module.
  */
 
 #include "k5buf-int.h"
diff --git a/src/util/support/threads.c b/src/util/support/threads.c
index dddf6aae7..4370c0589 100644
--- a/src/util/support/threads.c
+++ b/src/util/support/threads.c
@@ -1,9 +1,8 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/threads.c - Portable thread support */
 /*
- * util/support/threads.c
- *
- * Copyright 2004,2005,2006,2007,2008 by the Massachusetts Institute of Technology.
- * All Rights Reserved.
+ * Copyright 2004,2005,2006,2007,2008 by the Massachusetts Institute of
+ * Technology.  All Rights Reserved.
  *
  * Export of this software from the United States of America may
  *   require a specific license from the United States Government.
@@ -23,9 +22,6 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
- *
- * Preliminary thread support.
  */
 
 #include <assert.h>
diff --git a/src/util/support/utf8.c b/src/util/support/utf8.c
index dcaa4cba4..4398275f7 100644
--- a/src/util/support/utf8.c
+++ b/src/util/support/utf8.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/utf8.c */
 /*
- * util/support/utf8.c
- *
  * Copyright 2008 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,8 +23,7 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
+/*
  * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
@@ -37,6 +35,9 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
+
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. */
+
 /* Basic UTF-8 routines
  *
  * These routines are "dumb".  Though they understand UTF-8,
diff --git a/src/util/support/utf8_conv.c b/src/util/support/utf8_conv.c
index 47ff9511b..6e7c5880d 100644
--- a/src/util/support/utf8_conv.c
+++ b/src/util/support/utf8_conv.c
@@ -1,7 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
+/* util/support/utf8_conv.c */
 /*
- * util/support/utf8_conv.c
- *
  * Copyright 2008 by the Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,8 +23,7 @@
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
  */
-/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
- *
+/*
  * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
@@ -37,7 +35,7 @@
  * top-level directory of the distribution or, alternatively, at
  * <http://www.OpenLDAP.org/license.html>.
  */
-/* Portions Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.
+/* Copyright (C) 1999, 2000 Novell, Inc. All Rights Reserved.
  *
  * THIS WORK IS SUBJECT TO U.S. AND INTERNATIONAL COPYRIGHT LAWS AND
  * TREATIES. USE, MODIFICATION, AND REDISTRIBUTION OF THIS WORK IS SUBJECT
@@ -49,6 +47,8 @@
  * THE PERPETRATOR TO CRIMINAL AND CIVIL LIABILITY.
  */
 
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>. */
+
 /*
  * UTF-8 Conversion Routines
  *
diff --git a/src/util/support/zap.c b/src/util/support/zap.c
index ae6baf006..48512a903 100644
--- a/src/util/support/zap.c
+++ b/src/util/support/zap.c
@@ -1,8 +1,6 @@
 /* -*- mode: c; c-basic-offset: 4; indent-tabs-mode: nil -*- */
-
+/* util/support/zap.c */
 /*
- * zap.c
- *
  * Copyright 2009 Massachusetts Institute of Technology.
  * All Rights Reserved.
  *
@@ -24,7 +22,9 @@
  * M.I.T. makes no representations about the suitability of
  * this software for any purpose.  It is provided "as is" without express
  * or implied warranty.
- *
+ */
+
+/*
  * krb5int_zap() is used by zap() (a static inline function defined in
  * k5-int.h) on non-Windows, non-gcc compilers, in order to prevent the
  * compiler from inlining and optimizing out the memset() call.