summaryrefslogtreecommitdiff
path: root/src/commit2.c
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-03-12 17:32:16 -0700
committerStig Thormodsrud <stig@vyatta.com>2009-03-12 17:32:16 -0700
commitd47c3861fd89e7d0e9af02f2f649e29526d41781 (patch)
tree40418acf708edfca612357f998059509217812f1 /src/commit2.c
parent7471b6fe77e8e3272f442af27e9204eda478257b (diff)
parent4cce3bd5cf88ac8b4e0dd2f330689d2379a76ee6 (diff)
downloadvyatta-cfg-d47c3861fd89e7d0e9af02f2f649e29526d41781.tar.gz
vyatta-cfg-d47c3861fd89e7d0e9af02f2f649e29526d41781.zip
Merge branch 'jenner' of http://git.vyatta.com/vyatta-cfg into jenner
Diffstat (limited to 'src/commit2.c')
-rw-r--r--src/commit2.c8
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");