external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-24 21:05:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

particle/map: don’t return NULL from instantiate()

Browse source 
Instead return an empty dynlist.
This commit is contained in:
Daniel Eklöf 2020-11-02 19:04:32 +01:00
parent 198a351c7c
commit 86ef9dcc02
No known key found for this signature in database
GPG key ID: 5BBD4992C116573F
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
particles/map.c
View file

@ -8,6 +8,7 @@
#include "../config-verify.h" #include "../config-verify.h"
#include "../particle.h" #include "../particle.h"
#include "../plugin.h" #include "../plugin.h"
#include "dynlist.h"
struct particle_map { struct particle_map {
const char *tag_value; const char *tag_value;
@ -89,10 +90,9 @@ instantiate(const struct particle *particle, const struct tag_set *tags)
const struct tag *tag = tag_for_name(tags, p->tag); const struct tag *tag = tag_for_name(tags, p->tag);
if (tag == NULL) { if (tag == NULL) {
if (p->default_particle != NULL) return p->default_particle != NULL
return p->default_particle->instantiate(p->default_particle, tags); ? p->default_particle->instantiate(p->default_particle, tags)
else : dynlist_exposable_new(NULL, 0, 0, 0);
return NULL;
} }
const char *tag_value = tag->as_string(tag); const char *tag_value = tag->as_string(tag);
@ -108,13 +108,16 @@ instantiate(const struct particle *particle, const struct tag_set *tags)
break; break;
} }
if (pp == NULL) {
assert(p->default_particle != NULL);
pp = p->default_particle;
}
struct eprivate *e = calloc(1, sizeof(*e)); struct eprivate *e = calloc(1, sizeof(*e));
e->exposable = pp->instantiate(pp, tags);
if (pp != NULL)
e->exposable = pp->instantiate(pp, tags);
else if (p->default_particle != NULL)
e->exposable = p->default_particle->instantiate(p->default_particle, tags);
else
e->exposable = dynlist_exposable_new(NULL, 0, 0, 0);
assert(e->exposable != NULL);
char *on_click = tags_expand_template(particle->on_click_template, tags); char *on_click = tags_expand_template(particle->on_click_template, tags);
struct exposable *exposable = exposable_common_new(particle, on_click); struct exposable *exposable = exposable_common_new(particle, on_click);