X-Git-Url: http://git.archive.openwrt.org/?p=project%2Ffirewall3.git;a=blobdiff_plain;f=options.c;h=d88d3ba09b50b6f17173af7fbac5071a692fe440;hp=f41153c693f35e509a3c531e2a7afa437ae67ddf;hb=6039c7f4b0052c4da21520cdd604f04a5a67f50d;hpb=50e97c52e75bdfd325cf20d43b32d294ff84d92f

diff --git a/options.c b/options.c
index f41153c..d88d3ba 100644
--- a/options.c
+++ b/options.c
@@ -1,7 +1,7 @@
 /*
  * firewall3 - 3rd OpenWrt UCI firewall implementation
  *
- *   Copyright (C) 2013-2014 Jo-Philipp Wich <jow@openwrt.org>
+ *   Copyright (C) 2013-2014 Jo-Philipp Wich <jo@mein.io>
  *
  * Permission to use, copy, modify, and/or distribute this software for any
  * purpose with or without fee is hereby granted, provided that the above
@@ -718,7 +718,7 @@ fw3_parse_weekdays(void *ptr, const char *val, bool is_list)
 
 	if (*val == '!')
 	{
-		setbit(*(uint8_t *)ptr, 0);
+		fw3_setbit(*(uint8_t *)ptr, 0);
 		while (isspace(*++val));
 	}
 
@@ -738,7 +738,7 @@ fw3_parse_weekdays(void *ptr, const char *val, bool is_list)
 			}
 		}
 
-		setbit(*(uint8_t *)ptr, w);
+		fw3_setbit(*(uint8_t *)ptr, w);
 	}
 
 	free(s);
@@ -753,7 +753,7 @@ fw3_parse_monthdays(void *ptr, const char *val, bool is_list)
 
 	if (*val == '!')
 	{
-		setbit(*(uint32_t *)ptr, 0);
+		fw3_setbit(*(uint32_t *)ptr, 0);
 		while (isspace(*++val));
 	}
 
@@ -770,7 +770,7 @@ fw3_parse_monthdays(void *ptr, const char *val, bool is_list)
 			return false;
 		}
 
-		setbit(*(uint32_t *)ptr, d);
+		fw3_setbit(*(uint32_t *)ptr, d);
 	}
 
 	free(s);
@@ -981,7 +981,7 @@ fw3_parse_options(void *s, const struct fw3_option *opts,
 
 bool
 fw3_parse_blob_options(void *s, const struct fw3_option *opts,
-                  struct blob_attr *a)
+                       struct blob_attr *a, const char *name)
 {
 	char *p, *v, buf[16];
 	bool known;
@@ -1007,7 +1007,9 @@ fw3_parse_blob_options(void *s, const struct fw3_option *opts,
 			{
 				if (!opt->elem_size)
 				{
-					fprintf(stderr, "%s must not be a list\n", opt->name);
+					fprintf(stderr, "%s: '%s' must not be a list\n",
+					        name, opt->name);
+
 					valid = false;
 				}
 				else
@@ -1025,7 +1027,8 @@ fw3_parse_blob_options(void *s, const struct fw3_option *opts,
 
 						if (!opt->parse(dest, v, true))
 						{
-							fprintf(stderr, "%s has invalid value '%s'\n", opt->name, v);
+							fprintf(stderr, "%s: '%s' has invalid value '%s'\n",
+							        name, opt->name, v);
 							valid = false;
 							continue;
 						}
@@ -1048,7 +1051,8 @@ fw3_parse_blob_options(void *s, const struct fw3_option *opts,
 				{
 					if (!opt->parse((char *)s + opt->offset, v, false))
 					{
-						fprintf(stderr, "%s has invalid value '%s'\n", opt->name, v);
+						fprintf(stderr, "%s: '%s' has invalid value '%s'\n",
+						        name, opt->name, v);
 						valid = false;
 					}
 				}
@@ -1060,7 +1064,8 @@ fw3_parse_blob_options(void *s, const struct fw3_option *opts,
 					{
 						if (!opt->parse(dest, p, true))
 						{
-							fprintf(stderr, "%s has invalid value '%s'\n", opt->name, p);
+							fprintf(stderr, "%s: '%s' has invalid value '%s'\n",
+							        name, opt->name, p);
 							valid = false;
 							continue;
 						}
@@ -1072,8 +1077,8 @@ fw3_parse_blob_options(void *s, const struct fw3_option *opts,
 			break;
 		}
 
-		if (!known)
-			fprintf(stderr, "%s is unknown\n", blobmsg_name(o));
+		if (!known && strcmp(blobmsg_name(o), "type"))
+			fprintf(stderr, "%s: '%s' is unknown\n", name, blobmsg_name(o));
 	}
 
 	return valid;