*: fix source file headers & includes for errcodes

* Use the correct license header
* Stop headers from including themselves
* Use uniform relative include conventions
* Ensure that sources include what they use
* Turn off clang-format around struct array blocks

Signed-off-by: Quentin Young <qlyoung@cumulusnetworks.com>

2 files changed, 23 insertions, 21 deletions

diff --git a/watchfrr/watchfrr_errors.c b/watchfrr/watchfrr_errors.c
index 6b0f68812..9a4842a5d 100644
--- a/watchfrr/watchfrr_errors.c
+++ b/watchfrr/watchfrr_errors.c
@@ -1,27 +1,29 @@
 /*
- * watchfrr_errors - code for error messages that may occur in the
- *              watchfrr process
+ * Watchfrr-specific error messages.
  * Copyright (C) 2018 Cumulus Networks, Inc.
  *               Donald Sharp
  *
- * FRR is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  *
- * FRR is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; see the file COPYING; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
 #include <zebra.h>
 
+#include "lib/ferr.h"
 #include "watchfrr_errors.h"
 
+/* clang-format off */
 static struct ferr_ref ferr_watchfrr_err[] = {
 	{
 		.code = WATCHFRR_ERR_CONNECTION,
@@ -33,6 +35,7 @@ static struct ferr_ref ferr_watchfrr_err[] = {
 		.code = END_FERR,
 	}
 };
+/* clang-format on */
 
 void watchfrr_error_init(void)
 {
diff --git a/watchfrr/watchfrr_errors.h b/watchfrr/watchfrr_errors.h
index bc0cc6f56..9d2912da4 100644
--- a/watchfrr/watchfrr_errors.h
+++ b/watchfrr/watchfrr_errors.h
@@ -1,28 +1,27 @@
 /*
- * watchfrr_errors - header for error messages that may occur in the
- * watchfrr process
+ * Watchfrr-specific error messages.
  * Copyright (C) 2018 Cumulus Networks, Inc.
  *               Donald Sharp
  *
- * FRR is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the
- * Free Software Foundation; either version 2, or (at your option) any
- * later version.
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the Free
+ * Software Foundation; either version 2 of the License, or (at your option)
+ * any later version.
  *
- * FRR is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
+ * This program is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
+ * more details.
  *
  * You should have received a copy of the GNU General Public License along
  * with this program; see the file COPYING; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
  */
+
 #ifndef __WATCHFRR_ERRORS_H__
 #define __WATCHFRR_ERRORS_H__
 
 #include "lib/ferr.h"
-#include "watchfrr_errors.h"
 
 enum watchfrr_ferr_refs {
 	WATCHFRR_ERR_CONNECTION = WATCHFRR_FERR_START,