X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=cli.c;h=b660273f96b397023e5f62ce3e45e329adeb1a0d;hp=7bef7a907d876ecfc24bab0169a7ee41cff88b0e;hb=1ba4eb1ad1f8e3bc72f2eac8dbde546a87d1d653;hpb=476db477246a1438f3b2535bf37ab7f9130827c8

diff --git a/cli.c b/cli.c
index 7bef7a9..b660273 100644
--- a/cli.c
+++ b/cli.c
@@ -224,8 +224,8 @@ static void uci_show_changes(struct uci_package *p)
 {
 	struct uci_element *e;
 
-	uci_foreach_element(&p->saved_history, e) {
-		struct uci_history *h = uci_to_history(e);
+	uci_foreach_element(&p->saved_delta, e) {
+		struct uci_delta *h = uci_to_delta(e);
 		char *prefix = "";
 		char *op = "=";
 
@@ -653,10 +653,10 @@ int main(int argc, char **argv)
 				ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
 				break;
 			case 'p':
-				uci_add_history_path(ctx, optarg);
+				uci_add_delta_path(ctx, optarg);
 				break;
 			case 'P':
-				uci_add_history_path(ctx, ctx->savedir);
+				uci_add_delta_path(ctx, ctx->savedir);
 				uci_set_savedir(ctx, optarg);
 				flags |= CLI_FLAG_NOCOMMIT;
 				break;
@@ -687,10 +687,9 @@ int main(int argc, char **argv)
 	ret = uci_cmd(argc - 1, argv + 1);
 	if (input != stdin)
 		fclose(input);
-	if (ret == 255) {
+
+	if (ret == 255)
 		uci_usage();
-		return 0;
-	}
 
 	uci_free_context(ctx);