From 8d5cbee91d0a926dcc8dd114ebebf01950cfd110 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 21 Jun 2018 08:46:05 -0400 Subject: [PATCH] staticd: Code review comments fixes 1) Conform staticd to proper gnu gpl file format. 2) Fix a spelling mistake found. Signed-off-by: Donald Sharp --- staticd/static_main.c | 16 ++++++++-------- staticd/static_memory.c | 16 ++++++++-------- staticd/static_memory.h | 16 ++++++++-------- staticd/static_nht.c | 16 ++++++++-------- staticd/static_nht.h | 16 ++++++++-------- staticd/static_routes.c | 18 +++++++++--------- staticd/static_routes.h | 16 ++++++++-------- staticd/static_vrf.c | 16 ++++++++-------- staticd/static_vrf.h | 16 ++++++++-------- staticd/static_vty.c | 18 +++++++++--------- staticd/static_vty.h | 17 ++++++++--------- staticd/static_zebra.c | 16 ++++++++-------- staticd/static_zebra.h | 17 ++++++++--------- 13 files changed, 106 insertions(+), 108 deletions(-) diff --git a/staticd/static_main.c b/staticd/static_main.c index 842de6af46..1bc0c30986 100644 --- a/staticd/static_main.c +++ b/staticd/static_main.c @@ -3,15 +3,15 @@ * 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 diff --git a/staticd/static_memory.c b/staticd/static_memory.c index 9eb5a6ffbe..77ca4a3439 100644 --- a/staticd/static_memory.c +++ b/staticd/static_memory.c @@ -3,15 +3,15 @@ * 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 diff --git a/staticd/static_memory.h b/staticd/static_memory.h index 60d2d9b5c3..77a0db3b12 100644 --- a/staticd/static_memory.h +++ b/staticd/static_memory.h @@ -3,15 +3,15 @@ * 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 diff --git a/staticd/static_nht.c b/staticd/static_nht.c index 76f5da532b..aea175b19b 100644 --- a/staticd/static_nht.c +++ b/staticd/static_nht.c @@ -3,15 +3,15 @@ * 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 diff --git a/staticd/static_nht.h b/staticd/static_nht.h index 27d5e74a74..f273c71bba 100644 --- a/staticd/static_nht.h +++ b/staticd/static_nht.h @@ -3,15 +3,15 @@ * 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 diff --git a/staticd/static_routes.c b/staticd/static_routes.c index 3eb4c8cc6d..b7699ae3f3 100644 --- a/staticd/static_routes.c +++ b/staticd/static_routes.c @@ -1,17 +1,17 @@ /* - * STATICd - vrf code + * STATICd - route code * 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 diff --git a/staticd/static_routes.h b/staticd/static_routes.h index ec4ca1861c..bb1b664378 100644 --- a/staticd/static_routes.h +++ b/staticd/static_routes.h @@ -3,15 +3,15 @@ * 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 diff --git a/staticd/static_vrf.c b/staticd/static_vrf.c index 45225bf8f1..6946f21271 100644 --- a/staticd/static_vrf.c +++ b/staticd/static_vrf.c @@ -3,15 +3,15 @@ * 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 diff --git a/staticd/static_vrf.h b/staticd/static_vrf.h index 40d56979bc..28fcdd0d36 100644 --- a/staticd/static_vrf.h +++ b/staticd/static_vrf.h @@ -3,15 +3,15 @@ * 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 diff --git a/staticd/static_vty.c b/staticd/static_vty.c index 1f54e9bff7..45a4d53ba1 100644 --- a/staticd/static_vty.c +++ b/staticd/static_vty.c @@ -3,15 +3,15 @@ * 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 @@ -325,7 +325,7 @@ static int static_route_leak( "%% Malformed source address\n"); else zlog_warn( - "%s: Malformed Source address: %s", + "%s: Malformed source address: %s", __PRETTY_FUNCTION__, src_str); return CMD_WARNING_CONFIG_FAILED; } diff --git a/staticd/static_vty.h b/staticd/static_vty.h index be7056a4d2..2f65c08b8b 100644 --- a/staticd/static_vty.h +++ b/staticd/static_vty.h @@ -2,16 +2,15 @@ * STATICd - vty header * Copyright (C) 2018 Cumulus Networks, Inc. * Donald Sharp + * 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 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. - * - * 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 diff --git a/staticd/static_zebra.c b/staticd/static_zebra.c index 0bb5d97868..9802aa548a 100644 --- a/staticd/static_zebra.c +++ b/staticd/static_zebra.c @@ -3,15 +3,15 @@ * 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 diff --git a/staticd/static_zebra.h b/staticd/static_zebra.h index b408bc63bb..6b73b0dd3d 100644 --- a/staticd/static_zebra.h +++ b/staticd/static_zebra.h @@ -3,19 +3,18 @@ * 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 __STATIC_ZEBRA_H__ #define __STATIC_ZEBRA_H__ -- 2.39.5