Merge remote-tracking branch 'origin/master' into babel

[mirror_frr.git] / lib / log.c

diff --git a/lib/log.c b/lib/log.c
index 8ee9e27d966f6450acdd22bf7441afc656f4f564..b55a1c2ecf312540e45eb325daf554449de98f59 100644 (file)
--- a/lib/log.c
+++ b/lib/log.c
@@ -14,10 +14,9 @@
  * 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 GNU Zebra; see the file COPYING.  If not, write to the Free
- * Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  
+ * 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
  */
 
 #define FRR_DEFINE_DESC_TABLE
@@ -764,12 +763,6 @@ closezlog (void)
   zlog_default = NULL;
 }
 
-const char *
-zlog_protoname (void)
-{
-  return zlog_default ? zlog_default->protoname : "NONE";
-}
-
 /* Called from command.c. */
 void
 zlog_set_level (zlog_dest_t dest, int log_level)