diff options
| author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-28 10:03:14 -0700 |
|---|---|---|
| committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2008-05-28 10:03:14 -0700 |
| commit | 774b5b9ac303291dd153e79a6f6bab918a599025 (patch) | |
| tree | 2979f731dcf16aa677c07cc3ae4ff813c35fd2df /ospfd/ospf_network.c | |
| parent | 4421ea9c1df765b81cde6a9a4c2347e12151d230 (diff) | |
| download | quagga-774b5b9ac303291dd153e79a6f6bab918a599025.tar.bz2 quagga-774b5b9ac303291dd153e79a6f6bab918a599025.tar.xz | |
get rid of compiler warnings in OSPF
To get rid of warnings:
* remove unused functions with ifdef
* use correct printf formats
Diffstat (limited to 'ospfd/ospf_network.c')
| -rw-r--r-- | ospfd/ospf_network.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ospfd/ospf_network.c b/ospfd/ospf_network.c index d5bf7493..1a91001f 100644 --- a/ospfd/ospf_network.c +++ b/ospfd/ospf_network.c @@ -165,11 +165,7 @@ int ospf_sock_init (void) { int ospf_sock; - /* - * XXX warning: unused variable `tos' - * tos should be ifdefed similarly to usage - */ - int ret, tos, hincl = 1; + int ret, hincl = 1; if ( ospfd_privs.change (ZPRIVS_RAISE) ) zlog_err ("ospf_sock_init: could not raise privs, %s", @@ -201,8 +197,9 @@ ospf_sock_init (void) #elif defined (IPTOS_PREC_INTERNETCONTROL) #warning "IP_HDRINCL not available on this system" #warning "using IPTOS_PREC_INTERNETCONTROL" + { /* Set precedence field. */ - tos = IPTOS_PREC_INTERNETCONTROL; + int tos = IPTOS_PREC_INTERNETCONTROL; ret = setsockopt (ospf_sock, IPPROTO_IP, IP_TOS, (char *) &tos, sizeof (int)); if (ret < 0) @@ -216,6 +213,7 @@ ospf_sock_init (void) close (ospf_sock); /* Prevent sd leak. */ return ret; } + } #else /* !IPTOS_PREC_INTERNETCONTROL */ #warning "IP_HDRINCL not available, nor is IPTOS_PREC_INTERNETCONTROL" zlog_warn ("IP_HDRINCL option not available"); |