DeforaOS/libApp
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix looking up callbacks

Browse Source
This commit is contained in:
Pierre Pronchery 2016-09-12 19:48:10 +02:00
parent 1be1f1c11e
commit 978fb52911
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/appbroker.c
View File

@ -190,6 +190,7 @@ static char const * _appbroker_ctype(char const * type)
static int _appbroker_foreach_call(char const * key, Hash * value, void * data) static int _appbroker_foreach_call(char const * key, Hash * value, void * data)
{ {
AppBroker * appbroker = data; AppBroker * appbroker = data;
const char prefix[] = "call::";
unsigned int i; unsigned int i;
char buf[8]; char buf[8];
char const * p; char const * p;
@ -197,9 +198,9 @@ static int _appbroker_foreach_call(char const * key, Hash * value, void * data)
if(key == NULL || key[0] == '\0') if(key == NULL || key[0] == '\0')
return 0; return 0;
if(strncmp(key, "call::", 6) != 0) if(strncmp(key, prefix, sizeof(prefix) - 1) != 0)
return 0; return 0;
key += 6; key += sizeof(prefix) - 1;
if((p = hash_get(value, "ret")) == NULL) if((p = hash_get(value, "ret")) == NULL)
p = "VOID"; p = "VOID";
if((p = _appbroker_ctype(p)) == NULL) if((p = _appbroker_ctype(p)) == NULL)
@ -246,16 +247,17 @@ static int _appbroker_foreach_callback(char const * key, Hash * value,
{ {
/* XXX some code duplication with _appbroker_foreach_call() */ /* XXX some code duplication with _appbroker_foreach_call() */
AppBroker * appbroker = data; AppBroker * appbroker = data;
unsigned int i; const char prefix[] = "callback::";
int i;
char buf[8]; char buf[8];
char const * p; char const * p;
const char sep[] = ", "; const char sep[] = ", ";
if(key == NULL || key[0] == '\0') if(key == NULL || key[0] == '\0')
return 0; return 0;
if(strncmp(key, "callback::", 6) != 0) if(strncmp(key, prefix, sizeof(prefix) - 1) != 0)
return 0; return 0;
key += 6; key += sizeof(prefix) - 1;
if((p = hash_get(value, "ret")) == NULL) if((p = hash_get(value, "ret")) == NULL)
p = "VOID"; p = "VOID";
if((p = _appbroker_ctype(p)) == NULL) if((p = _appbroker_ctype(p)) == NULL)