summaryrefslogtreecommitdiff
path: root/ripngd
diff options
context:
space:
mode:
Diffstat (limited to 'ripngd')
-rw-r--r--ripngd/ChangeLog9
-rw-r--r--ripngd/ripng_main.c2
-rw-r--r--ripngd/ripng_routemap.c8
3 files changed, 10 insertions, 9 deletions
diff --git a/ripngd/ChangeLog b/ripngd/ChangeLog
index 46d4f9f7..556ca8b4 100644
--- a/ripngd/ChangeLog
+++ b/ripngd/ChangeLog
@@ -1,3 +1,12 @@
+2006-01-19 Paul Jakma <paul.jakma@sun.com>
+
+ * (general) various miscellaneous compiler warning fixes.
+ Remove redundant break statements from switch clauses
+ which return.
+ return from main, not exit, cause it annoys SOS.
+ Remove stray semi-colons which cause empty-statement
+ warnings.
+
2005-10-01 Andrew J. Schorr <ajschorr@alumni.princeton.edu>
* ripng_zebra.c: (ripng_redistribute_write) Remove local hard-coded
diff --git a/ripngd/ripng_main.c b/ripngd/ripng_main.c
index 5885f47c..e6276c1b 100644
--- a/ripngd/ripng_main.c
+++ b/ripngd/ripng_main.c
@@ -299,5 +299,5 @@ main (int argc, char **argv)
thread_call (&thread);
/* Not reached. */
- exit (0);
+ return 0;
}
diff --git a/ripngd/ripng_routemap.c b/ripngd/ripng_routemap.c
index 1c17e6c3..abaa61e1 100644
--- a/ripngd/ripng_routemap.c
+++ b/ripngd/ripng_routemap.c
@@ -57,11 +57,9 @@ ripng_route_match_add (struct vty *vty, struct route_map_index *index,
case RMAP_RULE_MISSING:
vty_out (vty, "Can't find rule.%s", VTY_NEWLINE);
return CMD_WARNING;
- break;
case RMAP_COMPILE_ERROR:
vty_out (vty, "Argument is malformed.%s", VTY_NEWLINE);
return CMD_WARNING;
- break;
}
}
return CMD_SUCCESS;
@@ -81,11 +79,9 @@ ripng_route_match_delete (struct vty *vty, struct route_map_index *index,
case RMAP_RULE_MISSING:
vty_out (vty, "Can't find rule.%s", VTY_NEWLINE);
return CMD_WARNING;
- break;
case RMAP_COMPILE_ERROR:
vty_out (vty, "Argument is malformed.%s", VTY_NEWLINE);
return CMD_WARNING;
- break;
}
}
return CMD_SUCCESS;
@@ -105,11 +101,9 @@ ripng_route_set_add (struct vty *vty, struct route_map_index *index,
case RMAP_RULE_MISSING:
vty_out (vty, "Can't find rule.%s", VTY_NEWLINE);
return CMD_WARNING;
- break;
case RMAP_COMPILE_ERROR:
vty_out (vty, "Argument is malformed.%s", VTY_NEWLINE);
return CMD_WARNING;
- break;
}
}
return CMD_SUCCESS;
@@ -129,11 +123,9 @@ ripng_route_set_delete (struct vty *vty, struct route_map_index *index,
case RMAP_RULE_MISSING:
vty_out (vty, "Can't find rule.%s", VTY_NEWLINE);
return CMD_WARNING;
- break;
case RMAP_COMPILE_ERROR:
vty_out (vty, "Argument is malformed.%s", VTY_NEWLINE);
return CMD_WARNING;
- break;
}
}
return CMD_SUCCESS;