Skip to content

Commit

Permalink
Only warning left is the known lvalue problem in ripng_nexthop.c.
Browse files Browse the repository at this point in the history
  • Loading branch information
hasso committed Oct 8, 2004
1 parent 27a43a8 commit 7a1d583
Show file tree
Hide file tree
Showing 7 changed files with 26 additions and 20 deletions.
5 changes: 5 additions & 0 deletions ripngd/ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
2004-10-08 Hasso Tepper <hasso at quagga.net>

* *.[c|h]: Fix compiler warnings: make strings const, signed ->
unsigned etc.

2004-09-26 Hasso Tepper <hasso at quagga.net>

* ripingd.c: Access list hook argument function must have struct
Expand Down
12 changes: 6 additions & 6 deletions ripngd/ripng_interface.c
Original file line number Diff line number Diff line change
Expand Up @@ -604,7 +604,7 @@ ripng_enable_network_add (struct prefix *p)
return -1;
}
else
node->info = "enabled";
node->info = (char *) "enabled";

/* XXX: One should find a better solution than a generic one */
ripng_enable_apply_all();
Expand Down Expand Up @@ -638,7 +638,7 @@ ripng_enable_network_delete (struct prefix *p)
int
ripng_enable_if_lookup (char *ifname)
{
int i;
unsigned int i;
char *str;

for (i = 0; i < vector_max (ripng_enable_if); i++)
Expand Down Expand Up @@ -836,7 +836,7 @@ ripng_enable_apply_all ()
void
ripng_clean_network ()
{
int i;
unsigned int i;
char *str;
struct route_node *rn;

Expand All @@ -862,7 +862,7 @@ vector Vripng_passive_interface;
int
ripng_passive_interface_lookup (char *ifname)
{
int i;
unsigned int i;
char *str;

for (i = 0; i < vector_max (Vripng_passive_interface); i++)
Expand Down Expand Up @@ -937,7 +937,7 @@ ripng_passive_interface_unset (struct vty *vty, char *ifname)
void
ripng_passive_interface_clean (void)
{
int i;
unsigned int i;
char *str;

for (i = 0; i < vector_max (Vripng_passive_interface); i++)
Expand All @@ -953,7 +953,7 @@ ripng_passive_interface_clean (void)
int
ripng_network_write (struct vty *vty, int config_mode)
{
int i;
unsigned int i;
char *ifname;
struct route_node *node;
char buf[BUFSIZ];
Expand Down
2 changes: 1 addition & 1 deletion ripngd/ripng_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ int vty_port = RIPNG_VTY_PORT;
struct thread_master *master;

/* Process ID saved for use by init system */
char *pid_file = PATH_RIPNGD_PID;
const char *pid_file = PATH_RIPNGD_PID;

/* Help information display. */
static void
Expand Down
8 changes: 4 additions & 4 deletions ripngd/ripng_routemap.c
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ struct rip_metric_modifier

int
ripng_route_match_add (struct vty *vty, struct route_map_index *index,
char *command, char *arg)
const char *command, char *arg)
{
int ret;

Expand All @@ -69,7 +69,7 @@ ripng_route_match_add (struct vty *vty, struct route_map_index *index,

int
ripng_route_match_delete (struct vty *vty, struct route_map_index *index,
char *command, char *arg)
const char *command, char *arg)
{
int ret;

Expand All @@ -93,7 +93,7 @@ ripng_route_match_delete (struct vty *vty, struct route_map_index *index,

int
ripng_route_set_add (struct vty *vty, struct route_map_index *index,
char *command, char *arg)
const char *command, char *arg)
{
int ret;

Expand All @@ -117,7 +117,7 @@ ripng_route_set_add (struct vty *vty, struct route_map_index *index,

int
ripng_route_set_delete (struct vty *vty, struct route_map_index *index,
char *command, char *arg)
const char *command, char *arg)
{
int ret;

Expand Down
6 changes: 3 additions & 3 deletions ripngd/ripng_zebra.c
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ ripng_redistribute_routemap_unset (int type)
static struct {
int type;
int str_min_len;
char *str;
const char *str;
} redist_type[] = {
{ZEBRA_ROUTE_KERNEL, 1, "kernel"},
{ZEBRA_ROUTE_CONNECT, 1, "connected"},
Expand Down Expand Up @@ -484,8 +484,8 @@ void
ripng_redistribute_write (struct vty *vty, int config_mode)
{
int i;
char *str[] = { "system", "kernel", "connected", "static", "rip",
"ripng", "ospf", "ospf6", "isis", "bgp"};
const char *str[] = { "system", "kernel", "connected", "static", "rip",
"ripng", "ospf", "ospf6", "isis", "bgp"};

for (i = 0; i < ZEBRA_ROUTE_MAX; i++)
if (i != zclient->redist_default && zclient->redist[i])
Expand Down
11 changes: 6 additions & 5 deletions ripngd/ripngd.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,11 +296,11 @@ ripng_recv_packet (int sock, u_char *buf, int bufsize,

/* Dump rip packet */
void
ripng_packet_dump (struct ripng_packet *packet, int size, char *sndrcv)
ripng_packet_dump (struct ripng_packet *packet, int size, const char *sndrcv)
{
caddr_t lim;
struct rte *rte;
char *command_str;
const char *command_str;

/* Set command string. */
if (packet->command == RIPNG_REQUEST)
Expand Down Expand Up @@ -1935,12 +1935,13 @@ ripng_event (enum ripng_event event, int sock)
}
}

/* Each route type's strings and default preference. */
/* Each route type's strings and default preference.
* FIXME: ISIS? What are these distance values? */
struct
{
int key;
char *str;
char *str_long;
const char *str;
const char *str_long;
int distance;
} route_info[] =
{
Expand Down
2 changes: 1 addition & 1 deletion ripngd/ripngd.h
Original file line number Diff line number Diff line change
Expand Up @@ -395,7 +395,7 @@ int ripng_write_rte (int num, struct stream *s, struct prefix_ipv6 *p,
int ripng_send_packet (caddr_t buf, int bufsize, struct sockaddr_in6 *to,
struct interface *ifp);

void ripng_packet_dump (struct ripng_packet *packet, int size, char *sndrcv);
void ripng_packet_dump (struct ripng_packet *packet, int size, const char *sndrcv);


#endif /* _ZEBRA_RIPNG_RIPNGD_H */

0 comments on commit 7a1d583

Please sign in to comment.