Skip to content
Snippets Groups Projects
Commit 95cc304f authored by Eric Vidal's avatar Eric Vidal :speech_balloon:
Browse files

simplify path declaration

parent 592fa176
No related branches found
No related tags found
No related merge requests found
......@@ -26,13 +26,7 @@ int state_check(resolve_service_t *res)
{
log_flow() ;
size_t len = strlen(res->sa.s + res->path.servicedir) ;
char target[len + SS_STATE_LEN + 1 + SS_STATUS_LEN + 1] ;
auto_strings(target, res->sa.s + res->path.servicedir, SS_STATE, "/", SS_STATUS) ;
if (access(target, F_OK) < 0)
if (access(res->sa.s + res->path.status, F_OK) < 0)
return 0 ;
return 1 ;
......
......@@ -27,14 +27,11 @@ int state_read(ss_state_t *sta, resolve_service_t *res)
{
log_flow() ;
size_t len = strlen(res->sa.s + res->path.servicedir) ;
int r ;
char pack[STATE_STATE_SIZE] ;
char target[len + SS_STATE_LEN + 1 + SS_STATUS_LEN + 1] ;
auto_strings(target, res->sa.s + res->path.servicedir, SS_STATE, "/", SS_STATUS) ;
if (openreadnclose(target, pack, STATE_STATE_SIZE) < STATE_STATE_SIZE)
r = openreadnclose(res->sa.s + res->path.status, pack, STATE_STATE_SIZE) ;
if (r < STATE_STATE_SIZE || r < 0)
return 0 ;
state_unpack(pack, sta) ;
......
......@@ -27,11 +27,5 @@ void state_rmfile(resolve_service_t *res)
{
log_flow() ;
size_t len = strlen(res->sa.s + res->path.servicedir) ;
char target[len + SS_STATE_LEN + 1 + SS_STATUS_LEN + 1] ;
auto_strings(target, res->sa.s + res->path.servicedir, SS_STATE, "/", SS_STATUS) ;
unlink_void(target) ;
unlink_void(res->sa.s + res->path.status) ;
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment