From: Felix Fietkau <nbd@nbd.name>
Date: Thu, 6 Oct 2016 18:02:36 +0000 (+0200)
Subject: cli: remove now-defunct UCI_FLAG_EXPORT_NAME support
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=2eb9c097e392;p=project%2Fuci.git

cli: remove now-defunct UCI_FLAG_EXPORT_NAME support

Preserve command line switches for compatibility reasons

Signed-off-by: Felix Fietkau <nbd@nbd.name>
---

diff --git a/cli.c b/cli.c
index f8b45db..deb670b 100644
--- a/cli.c
+++ b/cli.c
@@ -156,8 +156,6 @@ static void uci_usage(void)
 		"\t-d <str>   set the delimiter for list values in uci show\n"
 		"\t-f <file>  use <file> as input instead of stdin\n"
 		"\t-m         when importing, merge data into an existing package\n"
-		"\t-n         name unnamed sections on export (default)\n"
-		"\t-N         don't name unnamed sections\n"
 		"\t-p <path>  add a search path for config change files\n"
 		"\t-P <path>  add a search path for config change files and use as default\n"
 		"\t-q         quiet mode (don't print error messages)\n"
@@ -729,12 +727,6 @@ int main(int argc, char **argv)
 				ctx->flags &= ~UCI_FLAG_STRICT;
 				ctx->flags |= UCI_FLAG_PERROR;
 				break;
-			case 'n':
-				ctx->flags |= UCI_FLAG_EXPORT_NAME;
-				break;
-			case 'N':
-				ctx->flags &= ~UCI_FLAG_EXPORT_NAME;
-				break;
 			case 'p':
 				uci_add_delta_path(ctx, optarg);
 				break;
@@ -749,6 +741,10 @@ int main(int argc, char **argv)
 			case 'X':
 				flags &= ~CLI_FLAG_SHOW_EXT;
 				break;
+			case 'n':
+			case 'N':
+				/* obsolete */
+				break;
 			default:
 				uci_usage();
 				return 0;
diff --git a/uci.h b/uci.h
index 6a72b6a..eea7303 100644
--- a/uci.h
+++ b/uci.h
@@ -370,7 +370,7 @@ enum uci_option_type {
 enum uci_flags {
 	UCI_FLAG_STRICT =        (1 << 0), /* strict mode for the parser */
 	UCI_FLAG_PERROR =        (1 << 1), /* print parser error messages */
-	UCI_FLAG_EXPORT_NAME =   (1 << 2), /* when exporting, name unnamed sections */
+	UCI_FLAG_EXPORT_NAME =   (1 << 2), /* when exporting, name unnamed sections [unused] */
 	UCI_FLAG_SAVED_DELTA = (1 << 3), /* store the saved delta in memory as well */
 };