[OpenWrt-Devel,2/4] cli: properly unload package before quit.
diff mbox

Message ID 1422112073-24903-3-git-send-email-yszhou4tech@gmail.com
State Accepted
Headers show

Commit Message

Yousong Zhou Jan. 24, 2015, 3:07 p.m. UTC
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>
---
 cli.c |   13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

Patch
diff mbox

diff --git a/cli.c b/cli.c
index 2ee1e36..8f32255 100644
--- a/cli.c
+++ b/cli.c
@@ -286,7 +286,7 @@  static int package_cmd(int cmd, char *tuple)
 {
 	struct uci_element *e = NULL;
 	struct uci_ptr ptr;
-	int ret = 0;
+	int ret = 1;
 
 	if (uci_lookup_ptr(ctx, &ptr, tuple, true) != UCI_OK) {
 		cli_perror();
@@ -299,11 +299,12 @@  static int package_cmd(int cmd, char *tuple)
 		uci_show_changes(ptr.p);
 		break;
 	case CMD_COMMIT:
-		if (flags & CLI_FLAG_NOCOMMIT)
-			return 0;
+		if (flags & CLI_FLAG_NOCOMMIT) {
+			ret = 0;
+			goto out;
+		}
 		if (uci_commit(ctx, &ptr.p, false) != UCI_OK) {
 			cli_perror();
-			ret = 1;
 		}
 		break;
 	case CMD_EXPORT:
@@ -313,7 +314,6 @@  static int package_cmd(int cmd, char *tuple)
 		if (!(ptr.flags & UCI_LOOKUP_COMPLETE)) {
 			ctx->err = UCI_ERR_NOTFOUND;
 			cli_perror();
-			ret = 1;
 		}
 		switch(e->type) {
 			case UCI_TYPE_PACKAGE:
@@ -327,11 +327,12 @@  static int package_cmd(int cmd, char *tuple)
 				break;
 			default:
 				/* should not happen */
-				return 1;
+				goto out;
 		}
 		break;
 	}
 
+out:
 	if (ptr.p)
 		uci_unload(ctx, ptr.p);
 	return ret;