keyval.c (7e0019a7196ebed177c95824875cf852e1a6f667) | keyval.c (7dc847ebba953db90853d15f140c20eef74d4fb2) |
---|---|
1/* 2 * Parsing KEY=VALUE,... strings 3 * 4 * Copyright (C) 2017 Red Hat Inc. 5 * 6 * Authors: 7 * Markus Armbruster <armbru@redhat.com>, 8 * --- 207 unchanged lines hidden (view full) --- 216 } 217 218 if (s != key) { 219 next = keyval_parse_put(cur, key_in_cur, NULL, 220 key, s - 1, errp); 221 if (!next) { 222 return NULL; 223 } | 1/* 2 * Parsing KEY=VALUE,... strings 3 * 4 * Copyright (C) 2017 Red Hat Inc. 5 * 6 * Authors: 7 * Markus Armbruster <armbru@redhat.com>, 8 * --- 207 unchanged lines hidden (view full) --- 216 } 217 218 if (s != key) { 219 next = keyval_parse_put(cur, key_in_cur, NULL, 220 key, s - 1, errp); 221 if (!next) { 222 return NULL; 223 } |
224 cur = qobject_to_qdict(next); | 224 cur = qobject_to(QDict, next); |
225 assert(cur); 226 } 227 228 memcpy(key_in_cur, s, len); 229 key_in_cur[len] = 0; 230 s += len; 231 232 if (*s != '.') { --- 76 unchanged lines hidden (view full) --- 309 has_member = false; 310 for (ent = qdict_first(cur); ent; ent = qdict_next(cur, ent)) { 311 if (key_to_index(ent->key, NULL) >= 0) { 312 has_index = true; 313 } else { 314 has_member = true; 315 } 316 | 225 assert(cur); 226 } 227 228 memcpy(key_in_cur, s, len); 229 key_in_cur[len] = 0; 230 s += len; 231 232 if (*s != '.') { --- 76 unchanged lines hidden (view full) --- 309 has_member = false; 310 for (ent = qdict_first(cur); ent; ent = qdict_next(cur, ent)) { 311 if (key_to_index(ent->key, NULL) >= 0) { 312 has_index = true; 313 } else { 314 has_member = true; 315 } 316 |
317 qdict = qobject_to_qdict(ent->value); | 317 qdict = qobject_to(QDict, ent->value); |
318 if (!qdict) { 319 continue; 320 } 321 322 key_node.data = ent->key; 323 val = keyval_listify(qdict, &key_node, errp); 324 if (!val) { 325 return NULL; --- 95 unchanged lines hidden --- | 318 if (!qdict) { 319 continue; 320 } 321 322 key_node.data = ent->key; 323 val = keyval_listify(qdict, &key_node, errp); 324 if (!val) { 325 return NULL; --- 95 unchanged lines hidden --- |