proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-13 17:40:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More compiler cleanup (#4487)

Browse Source 
More compiler cleanup
This commit is contained in:
David Lamparter 2019-06-11 13:31:52 +02:00 committed by GitHub
commit e787685f86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 26 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/plist.c
View File

@ -1009,7 +1009,7 @@ static int vty_prefix_list_uninstall(struct vty *vty, afi_t afi,
if (pentry == NULL) {
vty_out(vty,
"%% Can't find prefix-list %s with sequence number %lu\n",
"%% Can't find prefix-list %s with sequence number %" PRIu64 "\n",
name, seqnum);
return CMD_WARNING_CONFIG_FAILED;
}

1
lib/printf/printf-pos.c
View File

@ -54,6 +54,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <strings.h>
#include <wchar.h>
#include "printflocal.h"

6
lib/sockopt.c
View File

@ -701,6 +701,12 @@ int sockopt_tcp_signature_ext(int sock, union sockunion *su, uint16_t prefixlen,
}
return ret;
#endif /* HAVE_TCP_MD5SIG */
/*
* Making compiler happy. If we get to this point we probably
* have done something really really wrong.
*/
return -2;
}
int sockopt_tcp_signature(int sock, union sockunion *su, const char *password)

2
lib/thread.c
View File

@ -95,7 +95,7 @@ static void cpu_record_hash_free(void *a)
static void vty_out_cpu_thread_history(struct vty *vty,
struct cpu_thread_history *a)
{
vty_out(vty, "%5zu %10zu.%03lu %9zu %8zu %9zu %8lu %9lu",
vty_out(vty, "%5zu %10zu.%03zu %9zu %8zu %9zu %8zu %9zu",
a->total_active, a->cpu.total / 1000, a->cpu.total % 1000,
a->total_calls, a->cpu.total / a->total_calls, a->cpu.max,
a->real.total / a->total_calls, a->real.max);

12
pimd/pim_cmd.c
View File

@ -1536,7 +1536,7 @@ static void pim_show_interface_traffic(struct pim_instance *pim,
json_object_object_add(json, ifp->name, json_row);
} else {
vty_out(vty,
"%-16s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7lu/%-7lu \n",
"%-16s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7" PRIu64 "/%-7" PRIu64 "\n",
ifp->name, pim_ifp->pim_ifstat_hello_recv,
pim_ifp->pim_ifstat_hello_sent,
pim_ifp->pim_ifstat_join_recv,
@ -1629,7 +1629,7 @@ static void pim_show_interface_traffic_single(struct pim_instance *pim,
json_object_object_add(json, ifp->name, json_row);
} else {
vty_out(vty,
"%-16s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7lu/%-7lu \n",
"%-16s %8u/%-8u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7u/%-7u %7" PRIu64 "/%-7" PRIu64 "\n",
ifp->name, pim_ifp->pim_ifstat_hello_recv,
pim_ifp->pim_ifstat_hello_sent,
pim_ifp->pim_ifstat_join_recv,
@ -3238,9 +3238,11 @@ static void pim_show_statistics(struct pim_instance *pim, struct vty *vty,
} else {
vty_out(vty, "BSM Statistics :\n");
vty_out(vty, "----------------\n");
vty_out(vty, "Number of Received BSMs : %ld\n", pim->bsm_rcvd);
vty_out(vty, "Number of Forwared BSMs : %ld\n", pim->bsm_sent);
vty_out(vty, "Number of Dropped BSMs : %ld\n",
vty_out(vty, "Number of Received BSMs : %" PRIu64 "\n",
pim->bsm_rcvd);
vty_out(vty, "Number of Forwared BSMs : %" PRIu64 "\n",
pim->bsm_sent);
vty_out(vty, "Number of Dropped BSMs : %" PRIu64 "\n",
pim->bsm_dropped);
}

12
pimd/pim_mroute.c
View File

@ -897,11 +897,11 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name)
int err;
int orig = 0;
int orig_iif_vif = 0;
struct pim_interface *pim_reg_ifp;
int orig_pimreg_ttl;
struct pim_interface *pim_reg_ifp = NULL;
int orig_pimreg_ttl = 0;
bool pimreg_ttl_reset = false;
struct pim_interface *vxlan_ifp;
int orig_term_ttl;
struct pim_interface *vxlan_ifp = NULL;
int orig_term_ttl = 0;
bool orig_term_ttl_reset = false;
pim->mroute_add_last = pim_time_monotonic_sec();
@ -985,9 +985,11 @@ int pim_mroute_add(struct channel_oil *c_oil, const char *name)
if (c_oil->oil.mfcc_origin.s_addr == INADDR_ANY)
c_oil->oil.mfcc_ttls[c_oil->oil.mfcc_parent] = orig;
if (pimreg_ttl_reset)
if (pimreg_ttl_reset) {
assert(pim_reg_ifp);
c_oil->oil.mfcc_ttls[pim_reg_ifp->mroute_vif_index] =
orig_pimreg_ttl;
}
if (orig_term_ttl_reset)
c_oil->oil.mfcc_ttls[vxlan_ifp->mroute_vif_index] =

2
sharpd/sharp_vty.c
View File

@ -150,7 +150,7 @@ DEFPY (install_routes_data_dump,
sg.r.total_routes,
sg.r.installed_routes,
sg.r.removed_routes,
r.tv_sec, r.tv_usec);
r.tv_sec, (long int)r.tv_usec);
return CMD_SUCCESS;
}

4
sharpd/sharp_zebra.c
View File

@ -213,7 +213,7 @@ static int route_notify_owner(ZAPI_CALLBACK_ARGS)
monotime(&sg.r.t_end);
timersub(&sg.r.t_end, &sg.r.t_start, &r);
zlog_debug("Installed All Items %ld.%ld", r.tv_sec,
r.tv_usec);
(long int)r.tv_usec);
handle_repeated(true);
}
break;
@ -229,7 +229,7 @@ static int route_notify_owner(ZAPI_CALLBACK_ARGS)
monotime(&sg.r.t_end);
timersub(&sg.r.t_end, &sg.r.t_start, &r);
zlog_debug("Removed all Items %ld.%ld", r.tv_sec,
r.tv_usec);
(long int)r.tv_usec);
handle_repeated(false);
}
break;