babeld: address some compilation warnings

Including system headers is not necessary with zebra.h included and
sometimes results in "__ASSERT_FUNCTION redefined" compilation warning.

* babeld.c
  * babel_distribute_update_interface(): make static
* babel_interface.c
  * interface_config_write(): unused 'babel_ifp'
  * don't include system headers
* message.c
  * send_request(): unused 'babel_ifp'
  * send_multihop_request(): idem
  * don't include system headers
* route.c: don't include system headers
* xroute.c: idem
* source.h: newline at EOF
* message.h: idem
This commit is contained in:
Denis Ovsienko 2012-01-08 16:52:36 +04:00 committed by Paul Jakma
parent ef4de4d36c
commit 3dbda0ceeb
5 changed files with 1 additions and 42 deletions

View File

@ -37,17 +37,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/ */
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <assert.h>
#include <sys/time.h>
#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <net/if.h>
#include <arpa/inet.h>
#include <zebra.h> #include <zebra.h>
#include "memory.h" #include "memory.h"
#include "log.h" #include "log.h"
@ -724,12 +713,9 @@ interface_config_write (struct vty *vty)
{ {
struct listnode *node; struct listnode *node;
struct interface *ifp; struct interface *ifp;
babel_interface_nfo *babel_ifp;
int write = 0; int write = 0;
for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp)) { for (ALL_LIST_ELEMENTS_RO (iflist, node, ifp)) {
babel_ifp = babel_get_if_nfo(ifp);
/* Do not display the interface if there is no configuration about it */ /* Do not display the interface if there is no configuration about it */
if (ifp->desc == NULL) if (ifp->desc == NULL)
continue; continue;

View File

@ -560,7 +560,7 @@ babel_distribute_update (struct distribute *dist)
} }
} }
void static void
babel_distribute_update_interface (struct interface *ifp) babel_distribute_update_interface (struct interface *ifp)
{ {
struct distribute *dist; struct distribute *dist;

View File

@ -37,14 +37,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/ */
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <assert.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <arpa/inet.h>
#include <zebra.h> #include <zebra.h>
#include "if.h" #include "if.h"
@ -1216,7 +1208,6 @@ void
send_request(struct interface *ifp, send_request(struct interface *ifp,
const unsigned char *prefix, unsigned char plen) const unsigned char *prefix, unsigned char plen)
{ {
babel_interface_nfo *babel_ifp = NULL;
int v4, len; int v4, len;
if(ifp == NULL) { if(ifp == NULL) {
@ -1236,7 +1227,6 @@ send_request(struct interface *ifp,
if(!if_up(ifp)) if(!if_up(ifp))
return; return;
babel_ifp = babel_get_if_nfo(ifp);
debugf(BABEL_DEBUG_COMMON,"sending request to %s for %s.", debugf(BABEL_DEBUG_COMMON,"sending request to %s for %s.",
ifp->name, prefix ? format_prefix(prefix, plen) : "any"); ifp->name, prefix ? format_prefix(prefix, plen) : "any");
v4 = plen >= 96 && v4mapped(prefix); v4 = plen >= 96 && v4mapped(prefix);
@ -1288,7 +1278,6 @@ send_multihop_request(struct interface *ifp,
unsigned short seqno, const unsigned char *id, unsigned short seqno, const unsigned char *id,
unsigned short hop_count) unsigned short hop_count)
{ {
babel_interface_nfo *babel_ifp = NULL;
int v4, pb, len; int v4, pb, len;
/* Make sure any buffered updates go out before this request. */ /* Make sure any buffered updates go out before this request. */
@ -1308,7 +1297,6 @@ send_multihop_request(struct interface *ifp,
if(!if_up(ifp)) if(!if_up(ifp))
return; return;
babel_ifp = babel_get_if_nfo(ifp);
debugf(BABEL_DEBUG_COMMON,"Sending request (%d) on %s for %s.", debugf(BABEL_DEBUG_COMMON,"Sending request (%d) on %s for %s.",
hop_count, ifp->name, format_prefix(prefix, plen)); hop_count, ifp->name, format_prefix(prefix, plen));
v4 = plen >= 96 && v4mapped(prefix); v4 = plen >= 96 && v4mapped(prefix);

View File

@ -37,13 +37,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/ */
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <errno.h>
#include <assert.h>
#include <sys/time.h>
#include <zebra.h> #include <zebra.h>
#include "if.h" #include "if.h"

View File

@ -37,14 +37,6 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE. THE SOFTWARE.
*/ */
#include <stdlib.h>
#include <stdio.h>
#include <string.h>
#include <errno.h>
#include <assert.h>
#include <sys/time.h>
#include <netinet/in.h>
#include <zebra.h> #include <zebra.h>
#include "if.h" #include "if.h"
#include "log.h" #include "log.h"