Formatting

diff --git a/src/lib/print.c b/src/lib/print.c
index 9304c71..554014f 100644 (file)
--- a/src/lib/print.c
+++ b/src/lib/print.c
@@ -392,9 +392,7 @@ size_t vp_data_prints_value(char *out, size_t outlen,
                 *      Ensure that WE add the quotation marks around the string.
                 */
                if (quote) {
-                       if (freespace < 3) {
-                               return inlen + 2;
-                       }
+                       if (freespace < 3) return inlen + 2;
 
                        *out++ = quote;
                        freespace--;

diff --git a/src/lib/value.c b/src/lib/value.c
index 13e2413..ee40aa0 100644 (file)
--- a/src/lib/value.c
+++ b/src/lib/value.c
@@ -716,7 +716,8 @@ ssize_t value_data_from_str(TALLOC_CTX *ctx, value_data_t *dst,
                 */
                if (src_enumv && *p && !is_whitespace(p)) {
                        if ((dval = dict_valbyname(src_enumv->attr, src_enumv->vendor, src)) == NULL) {
-                               fr_strerror_printf("Unknown value \"%s\" for attribute '%s'", src, src_enumv->name);
+                               fr_strerror_printf("Unknown or invalid value \"%s\" for attribute '%s'",
+                                                  src, src_enumv->name);
                                return -1;
                        }
 
@@ -748,7 +749,8 @@ ssize_t value_data_from_str(TALLOC_CTX *ctx, value_data_t *dst,
                 */
                if (src_enumv && *p && !is_whitespace(p)) {
                        if ((dval = dict_valbyname(src_enumv->attr, src_enumv->vendor, src)) == NULL) {
-                               fr_strerror_printf("Unknown value \"%s\" for attribute '%s'", src, src_enumv->name);
+                               fr_strerror_printf("Unknown or invalid value \"%s\" for attribute '%s'",
+                                                  src, src_enumv->name);
                                return -1;
                        }
 
@@ -780,7 +782,8 @@ ssize_t value_data_from_str(TALLOC_CTX *ctx, value_data_t *dst,
                 */
                if (src_enumv && *p && !is_whitespace(p)) {
                        if ((dval = dict_valbyname(src_enumv->attr, src_enumv->vendor, src)) == NULL) {
-                               fr_strerror_printf("Unknown value \"%s\" for attribute \"%s\"", src, src_enumv->name);
+                               fr_strerror_printf("Unknown or invalid value \"%s\" for attribute \"%s\"",
+                                                  src, src_enumv->name);
                                return -1;
                        }