[master] a040c673a Trivial typographical alignment of copyright notices.

Poul-Henning Kamp phk at FreeBSD.org
Wed Feb 24 11:32:08 UTC 2021


commit a040c673aefca9ebe29295d951ef3d1a4e35b598
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Wed Feb 24 10:55:01 2021 +0000

    Trivial typographical alignment of copyright notices.

diff --git a/bin/varnishd/common/heritage.h b/bin/varnishd/common/heritage.h
index e6daa8db3..f2b2e448f 100644
--- a/bin/varnishd/common/heritage.h
+++ b/bin/varnishd/common/heritage.h
@@ -1,4 +1,3 @@
-
 /*-
  * Copyright (c) 2006 Verdens Gang AS
  * Copyright (c) 2006-2011 Varnish Software AS
diff --git a/bin/varnishd/hpack/vhp.h b/bin/varnishd/hpack/vhp.h
index f89dd981a..37c74bdf4 100644
--- a/bin/varnishd/hpack/vhp.h
+++ b/bin/varnishd/hpack/vhp.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016 Varnish Software
+ * Copyright (c) 2016 Varnish Software AS
  * All rights reserved.
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
diff --git a/bin/varnishd/hpack/vhp_decode.c b/bin/varnishd/hpack/vhp_decode.c
index d18f30b13..b7c712212 100644
--- a/bin/varnishd/hpack/vhp_decode.c
+++ b/bin/varnishd/hpack/vhp_decode.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016 Varnish Software
+ * Copyright (c) 2016 Varnish Software AS
  * All rights reserved.
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
diff --git a/bin/varnishd/hpack/vhp_gen_hufdec.c b/bin/varnishd/hpack/vhp_gen_hufdec.c
index 679251efe..bfc052816 100644
--- a/bin/varnishd/hpack/vhp_gen_hufdec.c
+++ b/bin/varnishd/hpack/vhp_gen_hufdec.c
@@ -246,7 +246,8 @@ main(int argc, const char **argv)
 		    huf[u].code, huf[u].blen, huf[u].chr);
 
 	printf("/*\n");
-	printf(" * NB: This file is machine generated, DO NOT EDIT!\n");
+	printf(" * NB:  This file is machine generated, DO NOT EDIT!\n");
+	printf(" *\n");
 	printf(" */\n\n");
 
 	printf("#define HUFDEC_LEN %u\n", idx);
diff --git a/bin/varnishd/hpack/vhp_table.c b/bin/varnishd/hpack/vhp_table.c
index 4d8a6b7fa..4415f47b8 100644
--- a/bin/varnishd/hpack/vhp_table.c
+++ b/bin/varnishd/hpack/vhp_table.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016 Varnish Software
+ * Copyright (c) 2016 Varnish Software AS
  * All rights reserved.
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
diff --git a/bin/varnishd/mgt/mgt_jail_solaris_tbl.h b/bin/varnishd/mgt/mgt_jail_solaris_tbl.h
index 062f25bb6..7b1b0915f 100644
--- a/bin/varnishd/mgt/mgt_jail_solaris_tbl.h
+++ b/bin/varnishd/mgt/mgt_jail_solaris_tbl.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2020 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2020 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
diff --git a/bin/varnishd/waiter/cache_waiter_ports.c b/bin/varnishd/waiter/cache_waiter_ports.c
index 4120586f9..4055e1b61 100644
--- a/bin/varnishd/waiter/cache_waiter_ports.c
+++ b/bin/varnishd/waiter/cache_waiter_ports.c
@@ -3,7 +3,7 @@
  * Copyright (c) 2006 Varnish Software AS
  * Copyright (c) 2007 OmniTI Computer Consulting, Inc.
  * Copyright (c) 2007 Theo Schlossnagle
- * Copyright (c) 2010-2016 UPLEX, Nils Goroll
+ * Copyright (c) 2010-2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/bin/varnishhist/varnishhist_profiles.h b/bin/varnishhist/varnishhist_profiles.h
index 6619f06d1..42bf02251 100644
--- a/bin/varnishhist/varnishhist_profiles.h
+++ b/bin/varnishhist/varnishhist_profiles.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
diff --git a/include/tbl/ban_arg_oper.h b/include/tbl/ban_arg_oper.h
index d139e08a6..2589f0266 100644
--- a/include/tbl/ban_arg_oper.h
+++ b/include/tbl/ban_arg_oper.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2017 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2017 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
diff --git a/include/tbl/ban_oper.h b/include/tbl/ban_oper.h
index cd4103e61..2d244c6f5 100644
--- a/include/tbl/ban_oper.h
+++ b/include/tbl/ban_oper.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2017 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2017 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
diff --git a/include/tbl/vhd_fsm.h b/include/tbl/vhd_fsm.h
index ec7258706..a99a630a0 100644
--- a/include/tbl/vhd_fsm.h
+++ b/include/tbl/vhd_fsm.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016 Varnish Software
+ * Copyright (c) 2016 Varnish Software AS
  * All rights reserved.
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
diff --git a/include/tbl/vhd_fsm_funcs.h b/include/tbl/vhd_fsm_funcs.h
index e3f80f462..266a570c4 100644
--- a/include/tbl/vhd_fsm_funcs.h
+++ b/include/tbl/vhd_fsm_funcs.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016 Varnish Software
+ * Copyright (c) 2016 Varnish Software AS
  * All rights reserved.
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
diff --git a/include/tbl/vhd_return.h b/include/tbl/vhd_return.h
index aab5212fd..218a7bd1c 100644
--- a/include/tbl/vhd_return.h
+++ b/include/tbl/vhd_return.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2016 Varnish Software
+ * Copyright (c) 2016 Varnish Software AS
  * All rights reserved.
  *
  * Author: Martin Blix Grydeland <martin at varnish-software.com>
diff --git a/include/vbm_test.c b/include/vbm_test.c
index bf55a6a30..587f27d5a 100644
--- a/include/vbm_test.c
+++ b/include/vbm_test.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
diff --git a/include/vend.h b/include/vend.h
index 8a701b86e..f0eb5cc68 100644
--- a/include/vend.h
+++ b/include/vend.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2003,2010 Poul-Henning Kamp <phk at freebsd.org>
+ * Copyright (c) 2003,2010 Poul-Henning Kamp <phk at FreeBSD.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff --git a/include/vlu.h b/include/vlu.h
index 12d55a057..3bb68ba82 100644
--- a/include/vlu.h
+++ b/include/vlu.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2005-2008 Poul-Henning Kamp <phk at freebsd.org>
+ * Copyright (c) 2005-2008 Poul-Henning Kamp <phk at FreeBSD.org>
  * All rights reserved.
  *
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/include/vsb.h b/include/vsb.h
index 06239b6bb..f67220e96 100644
--- a/include/vsb.h
+++ b/include/vsb.h
@@ -1,7 +1,7 @@
 /*-
  * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
  *
- * Copyright (c) 2000-2011 Poul-Henning Kamp
+ * Copyright (c) 2000-2011 Poul-Henning Kamp <phk at FreeBSD.org>
  * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
diff --git a/lib/libvarnish/vlu.c b/lib/libvarnish/vlu.c
index 3c32a87a0..d8cb39c5c 100644
--- a/lib/libvarnish/vlu.c
+++ b/lib/libvarnish/vlu.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2005-2008 Poul-Henning Kamp <phk at freebsd.org>
+ * Copyright (c) 2005-2008 Poul-Henning Kamp <phk at FreeBSD.org>
  * All rights reserved.
  *
  * SPDX-License-Identifier: BSD-2-Clause
diff --git a/lib/libvarnish/vsb.c b/lib/libvarnish/vsb.c
index 6238d8349..8857bd26a 100644
--- a/lib/libvarnish/vsb.c
+++ b/lib/libvarnish/vsb.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2000-2008 Poul-Henning Kamp
+ * Copyright (c) 2000-2008 Poul-Henning Kamp <phk at FreeBSD.org>
  * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
  *
diff --git a/vmod/vmod_blob.c b/vmod/vmod_blob.c
index e1f474c26..70644f5ad 100644
--- a/vmod/vmod_blob.c
+++ b/vmod/vmod_blob.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2015-2017 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2015-2017 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Nils Goroll <nils.goroll at uplex.de>
diff --git a/vmod/vmod_blob.h b/vmod/vmod_blob.h
index 90872b61a..3c1048b48 100644
--- a/vmod/vmod_blob.h
+++ b/vmod/vmod_blob.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2015-2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2015-2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Nils Goroll <nils.goroll at uplex.de>
diff --git a/vmod/vmod_blob_base64.c b/vmod/vmod_blob_base64.c
index 06d6b6cef..b77c98e22 100644
--- a/vmod/vmod_blob_base64.c
+++ b/vmod/vmod_blob_base64.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2015-2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2015-2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Nils Goroll <nils.goroll at uplex.de>
diff --git a/vmod/vmod_blob_hex.c b/vmod/vmod_blob_hex.c
index 539ab87a7..fce4f7839 100644
--- a/vmod/vmod_blob_hex.c
+++ b/vmod/vmod_blob_hex.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Nils Goroll <nils.goroll at uplex.de>
diff --git a/vmod/vmod_blob_id.c b/vmod/vmod_blob_id.c
index ad6b64607..cf5b6ee72 100644
--- a/vmod/vmod_blob_id.c
+++ b/vmod/vmod_blob_id.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2015-2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2015-2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Nils Goroll <nils.goroll at uplex.de>
diff --git a/vmod/vmod_blob_url.c b/vmod/vmod_blob_url.c
index 9ce272ed8..aff0669e9 100644
--- a/vmod/vmod_blob_url.c
+++ b/vmod/vmod_blob_url.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2015-2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2015-2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Nils Goroll <nils.goroll at uplex.de>
diff --git a/vmod/vmod_cookie.c b/vmod/vmod_cookie.c
index 98e4bc44c..2cb1605e8 100644
--- a/vmod/vmod_cookie.c
+++ b/vmod/vmod_cookie.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright (c) 2012-2020 Varnish Software
+ * Copyright (c) 2012-2020 Varnish Software AS
  *
  * Author: Lasse Karstensen <lasse.karstensen at gmail.com>
  * Author: Lasse Karstensen <lkarsten at varnish-software.com>
diff --git a/vmod/vmod_directors_shard.c b/vmod/vmod_directors_shard.c
index 19f48339b..8e544ce4b 100644
--- a/vmod/vmod_directors_shard.c
+++ b/vmod/vmod_directors_shard.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2009-2018 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2009-2018 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Julian Wiesener <jw at uplex.de>
diff --git a/vmod/vmod_directors_shard_cfg.c b/vmod/vmod_directors_shard_cfg.c
index 6ba55b692..53088a404 100644
--- a/vmod/vmod_directors_shard_cfg.c
+++ b/vmod/vmod_directors_shard_cfg.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2009-2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2009-2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Nils Goroll <nils.goroll at uplex.de>
diff --git a/vmod/vmod_directors_shard_cfg.h b/vmod/vmod_directors_shard_cfg.h
index 87a6f69e4..d2f66a717 100644
--- a/vmod/vmod_directors_shard_cfg.h
+++ b/vmod/vmod_directors_shard_cfg.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Author: Nils Goroll <nils.goroll at uplex.de>
diff --git a/vmod/vmod_directors_shard_dir.c b/vmod/vmod_directors_shard_dir.c
index 9b82722d1..3393a7faf 100644
--- a/vmod/vmod_directors_shard_dir.c
+++ b/vmod/vmod_directors_shard_dir.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2009-2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2009-2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Nils Goroll <nils.goroll at uplex.de>
diff --git a/vmod/vmod_directors_shard_dir.h b/vmod/vmod_directors_shard_dir.h
index 47a66b92a..fb49bcdfc 100644
--- a/vmod/vmod_directors_shard_dir.h
+++ b/vmod/vmod_directors_shard_dir.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2009-2016 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2009-2016 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Julian Wiesener <jw at uplex.de>
diff --git a/vmod/vmod_unix.c b/vmod/vmod_unix.c
index 1edfca9d5..ccd0f1a85 100644
--- a/vmod/vmod_unix.c
+++ b/vmod/vmod_unix.c
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2018 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2018 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Geoffrey Simmons <geoffrey.simmons at uplex.de>
diff --git a/vmod/vmod_unix_cred_compat.h b/vmod/vmod_unix_cred_compat.h
index 9ac8438f8..1b741ddde 100644
--- a/vmod/vmod_unix_cred_compat.h
+++ b/vmod/vmod_unix_cred_compat.h
@@ -1,5 +1,5 @@
 /*-
- * Copyright 2018 UPLEX - Nils Goroll Systemoptimierung
+ * Copyright (c) 2018 UPLEX - Nils Goroll Systemoptimierung
  * All rights reserved.
  *
  * Authors: Geoffrey Simmons <geoffrey.simmons at uplex.de>


More information about the varnish-commit mailing list