commit e17a493d51a69804836528983d24bbc1d75dd9e5
author Nikias Bassen <nikias@gmx.li> Mon Feb 06 18:21:26 2017 +0100
committer Nikias Bassen <nikias@gmx.li> Mon Feb 06 18:21:26 2017 +0100
tree e4e1dc4f44594ccead77b83e588421d8d01454eb
parent ca75d9fffd633e42b2fe8b12031a25867108856f

bplist: Refine some debug/error messages in parse_dict_node()

src/bplist.c

diff --git a/src/bplist.c b/src/bplist.c
index cc0b928..ecc0684 100644
--- a/src/bplist.c
+++ b/src/bplist.c
@@ -426,12 +426,12 @@
 
         if (index1 >= bplist->num_objects) {
             plist_free(node);
-            PLIST_BIN_ERR("%s: dict entry %" PRIu64 " key index (%" PRIu64 ") must be smaller than the number of objects (%" PRIu64 ")\n", __func__, j, index1, bplist->num_objects);
+            PLIST_BIN_ERR("%s: dict entry %" PRIu64 ": key index (%" PRIu64 ") must be smaller than the number of objects (%" PRIu64 ")\n", __func__, j, index1, bplist->num_objects);
             return NULL;
         }
         if (index2 >= bplist->num_objects) {
             plist_free(node);
-            PLIST_BIN_ERR("%s: dict entry %" PRIu64 " value index (%" PRIu64 ") must be smaller than the number of objects (%" PRIu64 ")\n", __func__, j, index1, bplist->num_objects);
+            PLIST_BIN_ERR("%s: dict entry %" PRIu64 ": value index (%" PRIu64 ") must be smaller than the number of objects (%" PRIu64 ")\n", __func__, j, index1, bplist->num_objects);
             return NULL;
         }
 
@@ -443,7 +443,7 @@
         }
 
         if (plist_get_data(key)->type != PLIST_STRING) {
-            PLIST_BIN_ERR("%s: malformed binary plist dict, invalid node type for key!\n", __func__);
+            PLIST_BIN_ERR("%s: dict entry %" PRIu64 ": invalid node type for key\n", __func__, j);
             plist_free(node);
             return NULL;
         }
@@ -451,7 +451,7 @@
         /* enforce key type */
         plist_get_data(key)->type = PLIST_KEY;
         if (!plist_get_data(key)->strval) {
-            PLIST_BIN_ERR("%s: malformed binary plist dict, invalid key node encountered!\n", __func__);
+            PLIST_BIN_ERR("%s: dict entry %" PRIu64 ": key must not be NULL\n", __func__, j);
             plist_free(key);
             plist_free(node);
             return NULL;