diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-11 20:47:59 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-11 20:47:59 -0700 |
commit | f5f06eb9136b39834d9cf240d31236f9255e9c3f (patch) | |
tree | d724a945feed76700b6b3feaae5b5c545e36d4cb /src/commit2.c | |
parent | a7a8f7ab9a44071869945c0db085de2cd55f6db5 (diff) | |
parent | b04d003bd7fe306819ddcad8398f62d6f71edb9d (diff) | |
download | vyatta-cfg-f5f06eb9136b39834d9cf240d31236f9255e9c3f.tar.gz vyatta-cfg-f5f06eb9136b39834d9cf240d31236f9255e9c3f.zip |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg into jenner
Diffstat (limited to 'src/commit2.c')
-rw-r--r-- | src/commit2.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/commit2.c b/src/commit2.c index e6b63fa..bf5957d 100644 --- a/src/commit2.c +++ b/src/commit2.c @@ -2,16 +2,18 @@ #include <stdlib.h> #include <unistd.h> #include <syslog.h> +#include <string.h> #include <sys/time.h> #include <glib-2.0/glib.h> #include "common/common.h" +#include "cli_path_utils.h" boolean g_debug = FALSE; boolean g_display_error_node = FALSE; boolean g_coverage = FALSE; boolean g_dump_trans = FALSE; -int ActionOrder[top_act] = { +const int ActionOrder[top_act] = { 4, 5, 6, @@ -24,7 +26,7 @@ int ActionOrder[top_act] = { -char* ActionNames[top_act] = { +const char* ActionNames[top_act] = { "delete", //0 "create", //1 "activate", //2 @@ -81,7 +83,7 @@ also, the algorithm for collapsing the tree into a transaction list is: * **/ void -usage() +usage(void) { printf("commit2\n"); printf("\t-d\t\tdebug mode\n"); |