diff options
author | ajs <ajs> | 2005-04-02 23:23:55 +0000 |
---|---|---|
committer | ajs <ajs> | 2005-04-02 23:23:55 +0000 |
commit | e4319de388b748ba66551f33fecdf7446e754b80 (patch) | |
tree | d6ae690186b58ed048ed0a11911c6f1e2d71cd16 | |
parent | 21fefa9843f6e8fc2263e8d85cf0d072b4b6c242 (diff) |
2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ospf_interface.h: (ospf_if_lookup_by_name) Remove declaration of a
function that does not exist.
* ospf6_interface.[ch]: (ospf6_interface_lookup_by_name) Remove unused
function.
-rw-r--r-- | ospf6d/ChangeLog | 5 | ||||
-rw-r--r-- | ospf6d/ospf6_interface.c | 14 | ||||
-rw-r--r-- | ospf6d/ospf6_interface.h | 1 | ||||
-rw-r--r-- | ospfd/ChangeLog | 5 | ||||
-rw-r--r-- | ospfd/ospf_interface.h | 1 |
5 files changed, 10 insertions, 16 deletions
diff --git a/ospf6d/ChangeLog b/ospf6d/ChangeLog index 61a2e463..dc48ab7b 100644 --- a/ospf6d/ChangeLog +++ b/ospf6d/ChangeLog @@ -1,5 +1,10 @@ 2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + * ospf6_interface.[ch]: (ospf6_interface_lookup_by_name) Remove unused + function. + +2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + * ospf6_zebra.c: (ospf6_zebra_if_del) Previously, this whole function was commented out. But this is not safe: we should at least update the ifindex when the interface is deleted. So the new version diff --git a/ospf6d/ospf6_interface.c b/ospf6d/ospf6_interface.c index 8a7ef1b0..d4180d92 100644 --- a/ospf6d/ospf6_interface.c +++ b/ospf6d/ospf6_interface.c @@ -71,20 +71,6 @@ ospf6_interface_lookup_by_ifindex (int ifindex) return oi; } -struct ospf6_interface * -ospf6_interface_lookup_by_name (char *ifname) -{ - struct ospf6_interface *oi; - struct interface *ifp; - - ifp = if_lookup_by_name (ifname); - if (ifp == NULL) - return (struct ospf6_interface *) NULL; - - oi = (struct ospf6_interface *) ifp->info; - return oi; -} - /* schedule routing table recalculation */ void ospf6_interface_lsdb_hook (struct ospf6_lsa *lsa) diff --git a/ospf6d/ospf6_interface.h b/ospf6d/ospf6_interface.h index c6615d8c..fb93ceda 100644 --- a/ospf6d/ospf6_interface.h +++ b/ospf6d/ospf6_interface.h @@ -125,7 +125,6 @@ extern const char *ospf6_interface_state_str[]; /* Function Prototypes */ struct ospf6_interface *ospf6_interface_lookup_by_ifindex (int); -struct ospf6_interface *ospf6_interface_lookup_by_name (char *); struct ospf6_interface *ospf6_interface_create (struct interface *); void ospf6_interface_delete (struct ospf6_interface *); diff --git a/ospfd/ChangeLog b/ospfd/ChangeLog index d84d54b3..89fb9b41 100644 --- a/ospfd/ChangeLog +++ b/ospfd/ChangeLog @@ -1,5 +1,10 @@ 2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + * ospf_interface.h: (ospf_if_lookup_by_name) Remove declaration of a + function that does not exist. + +2005-04-02 Andrew J. Schorr <ajschorr@alumni.princeton.edu> + * ospf_zebra.c: (zebra_interface_if_lookup) Must use if_lookup_by_name_len. diff --git a/ospfd/ospf_interface.h b/ospfd/ospf_interface.h index b3fb3ba3..d089297f 100644 --- a/ospfd/ospf_interface.h +++ b/ospfd/ospf_interface.h @@ -208,7 +208,6 @@ int ospf_if_down (struct ospf_interface *); int ospf_if_is_up (struct ospf_interface *); struct ospf_interface *ospf_if_exists (struct ospf_interface *); -struct ospf_interface *ospf_if_lookup_by_name (char *); struct ospf_interface *ospf_if_lookup_by_local_addr (struct ospf *, struct interface *, struct in_addr); |