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

Use string_explode() according to the new API

Browse Source
This commit is contained in:
Pierre Pronchery 2018-01-23 05:16:59 +01:00
parent 217b5bdf66
commit 93040b8214
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/session.c
View File

@ -41,7 +41,7 @@ struct _Session
/* prototypes */
/* private */
/* accessors */
static String ** _session_get_config_services(Session * session);
static StringArray * _session_get_config_services(Session * session);
static String * _session_get_filename(Session * session);
/* useful */
@ -151,7 +151,7 @@ int session_stop(Session * session)
/* private */
/* session_get_config_services */
static String ** _session_get_config_services(Session * session)
static StringArray * _session_get_config_services(Session * session)
{
String const * profile;
String const * services;
@ -194,14 +194,14 @@ static String * _session_get_filename(Session * session)
/* useful */
static void _load_service_foreach(void * value, void * data);
static int _load_service(Session * session, String const * service);
static int _session_load(Session * session)
{
int ret;
String * filename;
String ** services;
String ** p;
StringArray * services;
#ifdef DEBUG
fprintf(stderr, "DEBUG: %s()\n", __func__);
@ -223,16 +223,21 @@ static int _session_load(Session * session)
if((services = _session_get_config_services(session)) == NULL)
return -1;
/* add the services */
for(p = services; *p != NULL; p++)
{
if(_load_service(session, *p) != 0)
error_print(PACKAGE);
string_delete(*p);
}
free(services);
array_foreach(services, _load_service_foreach, session);
array_foreach(services, (ArrayForeach)string_delete, NULL);
array_delete(services);
return 0;
}
static void _load_service_foreach(void * value, void * data)
{
String * service = value;
Session * session = data;
if(_load_service(session, service) != 0)
error_print(PACKAGE);
}
static int _load_service(Session * session, String const * service)
{
Service ** p;