*: 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>
2025-08-02 17:36:36 +00:00 · 2018-06-19 20:58:44 +00:00 · 2018-06-19 20:58:44 +00:00 · 247dcce2b5
commit 247dcce2b5
parent 313d7993a3
22 changed files with 222 additions and 196 deletions
--- a/babeld/babel_errors.c
+++ b/babeld/babel_errors.c
@ -1,27 +1,29 @@
 /*
- * babel_errors - code for error messages that may occur in the
- *              babel process
+ * Babel-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 "babel_errors.h"

+/* clang-format off */
 static struct ferr_ref ferr_babel_err[] = {
 	{
 		.code = BABEL_ERR_MEMORY,
@ -51,6 +53,7 @@ static struct ferr_ref ferr_babel_err[] = {
 		.code = END_FERR,
 	}
 };
+/* clang-format on */

 void babel_error_init(void)
 {
--- a/babeld/babel_errors.h
+++ b/babeld/babel_errors.h
@ -1,27 +1,27 @@
 /*
- * babel_errors - header for error messages that may occur in the babel process
+ * Babel-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 __BABEL_ERRORS_H__
 #define __BABEL_ERRORS_H__

-#include "ferr.h"
-#include "babel_errors.h"
+#include "lib/ferr.h"

 enum babel_ferr_refs {
 	BABEL_ERR_MEMORY = BABEL_FERR_START,
--- a/bgpd/bgp_errors.c
+++ b/bgpd/bgp_errors.c
@ -1,26 +1,29 @@
 /*
- * bgp_errors - code for error messages that may occur in the
- *              bgp process
+ * BGP-specific error messages.
 * Copyright (C) 2018 Cumulus Networks, Inc.
 *               Don Slice
 *
- * 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 <bgp_errors.h>

+#include <zebra.h>
+
+#include "lib/ferr.h"
+#include "bgp_errors.h"
+
+/* clang-format off */
 static struct ferr_ref ferr_bgp_err[] = {
 	{
 		.code = BGP_ERR_ATTR_FLAG,
@ -295,6 +298,7 @@ static struct ferr_ref ferr_bgp_err[] = {
 		.code = END_FERR,
 	}
 };
+/* clang-format on */

 void bgp_error_init(void)
 {
--- a/bgpd/bgp_errors.h
+++ b/bgpd/bgp_errors.h
@ -1,27 +1,27 @@
 /*
- * bgp_errors - header for error messages that may occur in the bgp process
+ * BGP-specific error messages.
 * Copyright (C) 2018 Cumulus Networks, Inc.
 *               Don Slice
 *
- * 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 __BGP_ERRORS_H__
 #define __BGP_ERRORS_H__

-#include "ferr.h"
-#include "bgp_errors.h"
+#include "lib/ferr.h"

 enum bgp_ferr_refs {

--- a/eigrpd/eigrp_errors.c
+++ b/eigrpd/eigrp_errors.c
@ -1,27 +1,29 @@
 /*
- * eigrp_errors - code for error messages that may occur in the
- *              eigrp process
+ * EIGRP-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 "eigrp_errors.h"

+/* clang-format off */
 static struct ferr_ref ferr_eigrp_err[] = {
 	{
 		.code = EIGRP_ERR_PACKET,
@ -39,6 +41,7 @@ static struct ferr_ref ferr_eigrp_err[] = {
 		.code = END_FERR,
 	}
 };
+/* clang-format on */

 void eigrp_error_init(void)
 {
--- a/eigrpd/eigrp_errors.h
+++ b/eigrpd/eigrp_errors.h
@ -1,27 +1,27 @@
 /*
- * eigrp_errors - header for error messages that may occur in the eigrp process
+ * EIGRP-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 __EIGRP_ERRORS_H__
 #define __EIGRP_ERRORS_H__

-#include "ferr.h"
-#include "eigrp_errors.h"
+#include "lib/ferr.h"

 enum eigrp_ferr_refs {
 	EIGRP_ERR_PACKET = EIGRP_FERR_START,
--- a/isisd/isis_errors.c
+++ b/isisd/isis_errors.c
@ -1,27 +1,29 @@
 /*
- * isis_errors - code for error messages that may occur in the
- *              isis process
+ * ISIS-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 "isis_errors.h"

+/* clang-format off */
 static struct ferr_ref ferr_isis_err[] = {
 	{
 		.code = ISIS_ERR_PACKET,
@ -39,6 +41,7 @@ static struct ferr_ref ferr_isis_err[] = {
 		.code = END_FERR,
 	}
 };
+/* clang-format on */

 void isis_error_init(void)
 {
--- a/isisd/isis_errors.h
+++ b/isisd/isis_errors.h
@ -1,27 +1,27 @@
 /*
- * isis_errors - header for error messages that may occur in the isis process
+ * ISIS-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 __ISIS_ERRORS_H__
 #define __ISIS_ERRORS_H__

-#include "ferr.h"
-#include "isis_errors.h"
+#include "lib/ferr.h"

 enum isis_ferr_refs {
 	ISIS_ERR_PACKET = ISIS_FERR_START,
--- a/lib/lib_errors.c
+++ b/lib/lib_errors.c
@ -18,7 +18,7 @@
 * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
 */

-#include <lib_errors.h>
+#include "lib_errors.h"

 /* clang-format off */
 static struct ferr_ref ferr_lib_err[] = {
--- a/lib/lib_errors.h
+++ b/lib/lib_errors.h
@ -17,10 +17,11 @@
 * 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 __LIB_ERRORS_H__
 #define __LIB_ERRORS_H__

-#include "ferr.h"
+#include "lib/ferr.h"

 enum lib_ferr_refs {
 	LIB_ERR_PRIVILEGES = LIB_FERR_START,
--- a/nhrpd/nhrp_errors.c
+++ b/nhrpd/nhrp_errors.c
@ -1,27 +1,29 @@
 /*
- * nhrp_errors - code for error messages that may occur in the
- *              nhrp process
+ * NHRP-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 "nhrp_errors.h"

+/* clang-format off */
 static struct ferr_ref ferr_nhrp_err[] = {
 	{
 		.code = NHRP_ERR_SWAN,
@ -39,6 +41,7 @@ static struct ferr_ref ferr_nhrp_err[] = {
 		.code = END_FERR,
 	}
 };
+/* clang-format on */

 void nhrp_error_init(void)
 {
--- a/nhrpd/nhrp_errors.h
+++ b/nhrpd/nhrp_errors.h
@ -1,27 +1,27 @@
 /*
- * nhrp_errors - header for error messages that may occur in the nhrp process
+ * NHRP-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 __NHRP_ERRORS_H__
 #define __NHRP_ERRORS_H__

-#include "ferr.h"
-#include "nhrp_errors.h"
+#include "lib/ferr.h"

 enum nhrp_ferr_refs {
 	NHRP_ERR_SWAN = NHRP_FERR_START,
--- a/ospfd/ospf_errors.c
+++ b/ospfd/ospf_errors.c
@ -1,24 +1,26 @@
 /*
- * ospf_errors - code for error messages that may occur in the
- *              ospf process
+ * OSPF-specific error messages.
 * Copyright (C) 2018 Cumulus Networks, Inc.
- *               Chirag Shah
+ *		Chirag Shah
 *
- * 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 "ospf_errors.h"

 static struct ferr_ref ferr_ospf_err[] = {
--- a/ospfd/ospf_errors.h
+++ b/ospfd/ospf_errors.h
@ -1,26 +1,27 @@
 /*
- * ospf_errors - header for error messages that may occur in the ospf process
+ * OSPF-specific error messages.
 * Copyright (C) 2018 Cumulus Networks, Inc.
 *		Chirag Shah
 *
- * 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 __OSPF_ERRORS_H__
 #define __OSPF_ERRORS_H__

-#include "ferr.h"
+#include "lib/ferr.h"

 enum ospf_ferr_refs {
 	OSPF_ERR_PKT_PROCESS = OSPF_FERR_START,
--- a/pimd/pim_errors.c
+++ b/pimd/pim_errors.c
@ -1,27 +1,29 @@
 /*
- * pim_errors - code for error messages that may occur in the
- *              pim process
+ * PIM-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 "pim_errors.h"

+/* clang-format off */
 static struct ferr_ref ferr_pim_err[] = {
 	{
 		.code = PIM_ERR_MSDP_PACKET,
@ -39,6 +41,7 @@ static struct ferr_ref ferr_pim_err[] = {
 		.code = END_FERR,
 	}
 };
+/* clang-format on */

 void pim_error_init(void)
 {
--- a/pimd/pim_errors.h
+++ b/pimd/pim_errors.h
@ -1,27 +1,27 @@
 /*
- * pim_errors - header for error messages that may occur in the pim process
+ * PIM-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 __PIM_ERRORS_H__
 #define __PIM_ERRORS_H__

-#include "ferr.h"
-#include "pim_errors.h"
+#include "lib/ferr.h"

 enum pim_ferr_refs {
 	PIM_ERR_MSDP_PACKET = PIM_FERR_START,
--- a/ripd/rip_errors.c
+++ b/ripd/rip_errors.c
@ -1,25 +1,26 @@
 /*
- * rip_errors - code for error messages that may occur in the
- *              rip process
+ * RIP-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 "rip_errors.h"

 static struct ferr_ref ferr_rip_err[] = {
--- a/ripd/rip_errors.h
+++ b/ripd/rip_errors.h
@ -1,27 +1,27 @@
 /*
- * rip_errors - header for error messages that may occur in the rip process
+ * RIP-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 __RIP_ERRORS_H__
 #define __RIP_ERRORS_H__

-#include "ferr.h"
-#include "rip_errors.h"
+#include "lib/ferr.h"

 enum rip_ferr_refs {
 	RIP_ERR_PACKET = RIP_FERR_START,
--- 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)
 {
--- 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,
--- a/zebra/zebra_errors.c
+++ b/zebra/zebra_errors.c
@ -19,8 +19,9 @@
 */

 #include <zebra.h>
+
+#include "lib/ferr.h"
 #include "zebra_errors.h"
-#include "ferr.h"

 /* clang-format off */
 static struct ferr_ref ferr_zebra_err[] = {
--- a/zebra/zebra_errors.h
+++ b/zebra/zebra_errors.h
@ -21,8 +21,7 @@
 #ifndef __ZEBRA_ERRORS_H__
 #define __ZEBRA_ERRORS_H__

-#include <zebra.h>
-#include "ferr.h"
+#include "lib/ferr.h"

 enum zebra_ferr_refs {
 	ZEBRA_ERR_LM_RESPONSE,