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

remove ss_resolve_add_uint32() and ss_resolve_pack() function

parent 320e9894
No related branches found
No related tags found
No related merge requests found
/*
/*
* resolve.h
*
*
* Copyright (c) 2018-2020 Eric Vidal <eric@obarun.org>
*
*
* All rights reserved.
*
*
* This file is part of Obarun. It is subject to the license terms in
* the LICENSE file found in the top-level directory of this
* distribution.
* This file may not be copied, modified, propagated, or distributed
* except according to the terms contained in the LICENSE file./
*/
#ifndef SS_RESOLVE_H
#define SS_RESOLVE_H
......@@ -41,85 +41,85 @@
typedef struct ss_resolve_s ss_resolve_t, *ss_resolve_t_ref ;
struct ss_resolve_s
{
uint32_t salen ;
stralloc sa ;
uint32_t name ;
uint32_t description ;
uint32_t version ;
uint32_t logger ;
uint32_t logreal ;
uint32_t logassoc ;
uint32_t dstlog ;
uint32_t deps ; // for module -> list of s6-rc service
uint32_t optsdeps ; //optional dependencies
uint32_t extdeps ; //external dependencies
uint32_t contents ; // module -> list of s6-rc and s6 service
uint32_t src ; //frontend source
uint32_t srconf ; //configuration file source
uint32_t live ; //run/66
uint32_t runat ; //livetree->longrun,scandir->svc
uint32_t tree ; //var/lib/66/system/tree
uint32_t treename ;
uint32_t state ; //run/66/state/uid/treename/
uint32_t exec_run ;
uint32_t exec_log_run ;
uint32_t real_exec_run ;
uint32_t real_exec_log_run ;
uint32_t exec_finish ;
uint32_t real_exec_finish ;
uint32_t type ;
uint32_t ndeps ;
uint32_t noptsdeps ;
uint32_t nextdeps ;
uint32_t ncontents ;
uint32_t down ;
uint32_t disen ;//disable->0,enable->1
uint32_t salen ;
stralloc sa ;
uint32_t name ;
uint32_t description ;
uint32_t version ;
uint32_t logger ;
uint32_t logreal ;
uint32_t logassoc ;
uint32_t dstlog ;
uint32_t deps ; // for module -> list of s6-rc service
uint32_t optsdeps ; //optional dependencies
uint32_t extdeps ; //external dependencies
uint32_t contents ; // module -> list of s6-rc and s6 service
uint32_t src ; //frontend source
uint32_t srconf ; //configuration file source
uint32_t live ; //run/66
uint32_t runat ; //livetree->longrun,scandir->svc
uint32_t tree ; //var/lib/66/system/tree
uint32_t treename ;
uint32_t state ; //run/66/state/uid/treename/
uint32_t exec_run ;
uint32_t exec_log_run ;
uint32_t real_exec_run ;
uint32_t real_exec_log_run ;
uint32_t exec_finish ;
uint32_t real_exec_finish ;
uint32_t type ;
uint32_t ndeps ;
uint32_t noptsdeps ;
uint32_t nextdeps ;
uint32_t ncontents ;
uint32_t down ;
uint32_t disen ;//disable->0,enable->1
} ;
#define RESOLVE_ZERO { 0,STRALLOC_ZERO,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0 }
typedef enum ss_resolve_enum_e ss_resolve_enum_t, *ss_resolve_enum_t_ref;
enum ss_resolve_enum_e
{
SS_RESOLVE_ENUM_NAME = 0,
SS_RESOLVE_ENUM_DESCRIPTION,
SS_RESOLVE_ENUM_VERSION,
SS_RESOLVE_ENUM_LOGGER,
SS_RESOLVE_ENUM_LOGREAL,
SS_RESOLVE_ENUM_LOGASSOC,
SS_RESOLVE_ENUM_DSTLOG,
SS_RESOLVE_ENUM_DEPS,
SS_RESOLVE_ENUM_OPTSDEPS,
SS_RESOLVE_ENUM_EXTDEPS,
SS_RESOLVE_ENUM_CONTENTS,
SS_RESOLVE_ENUM_SRC,
SS_RESOLVE_ENUM_SRCONF,
SS_RESOLVE_ENUM_LIVE,
SS_RESOLVE_ENUM_RUNAT,
SS_RESOLVE_ENUM_TREE,
SS_RESOLVE_ENUM_TREENAME,
SS_RESOLVE_ENUM_STATE,
SS_RESOLVE_ENUM_EXEC_RUN,
SS_RESOLVE_ENUM_EXEC_LOG_RUN,
SS_RESOLVE_ENUM_REAL_EXEC_RUN,
SS_RESOLVE_ENUM_REAL_EXEC_LOG_RUN,
SS_RESOLVE_ENUM_EXEC_FINISH,
SS_RESOLVE_ENUM_REAL_EXEC_FINISH,
SS_RESOLVE_ENUM_TYPE,
SS_RESOLVE_ENUM_NDEPS,
SS_RESOLVE_ENUM_NOPTSDEPS,
SS_RESOLVE_ENUM_NEXTDEPS,
SS_RESOLVE_ENUM_NCONTENTS,
SS_RESOLVE_ENUM_DOWN,
SS_RESOLVE_ENUM_DISEN,
SS_RESOLVE_ENUM_ENDOFKEY
SS_RESOLVE_ENUM_NAME = 0,
SS_RESOLVE_ENUM_DESCRIPTION,
SS_RESOLVE_ENUM_VERSION,
SS_RESOLVE_ENUM_LOGGER,
SS_RESOLVE_ENUM_LOGREAL,
SS_RESOLVE_ENUM_LOGASSOC,
SS_RESOLVE_ENUM_DSTLOG,
SS_RESOLVE_ENUM_DEPS,
SS_RESOLVE_ENUM_OPTSDEPS,
SS_RESOLVE_ENUM_EXTDEPS,
SS_RESOLVE_ENUM_CONTENTS,
SS_RESOLVE_ENUM_SRC,
SS_RESOLVE_ENUM_SRCONF,
SS_RESOLVE_ENUM_LIVE,
SS_RESOLVE_ENUM_RUNAT,
SS_RESOLVE_ENUM_TREE,
SS_RESOLVE_ENUM_TREENAME,
SS_RESOLVE_ENUM_STATE,
SS_RESOLVE_ENUM_EXEC_RUN,
SS_RESOLVE_ENUM_EXEC_LOG_RUN,
SS_RESOLVE_ENUM_REAL_EXEC_RUN,
SS_RESOLVE_ENUM_REAL_EXEC_LOG_RUN,
SS_RESOLVE_ENUM_EXEC_FINISH,
SS_RESOLVE_ENUM_REAL_EXEC_FINISH,
SS_RESOLVE_ENUM_TYPE,
SS_RESOLVE_ENUM_NDEPS,
SS_RESOLVE_ENUM_NOPTSDEPS,
SS_RESOLVE_ENUM_NEXTDEPS,
SS_RESOLVE_ENUM_NCONTENTS,
SS_RESOLVE_ENUM_DOWN,
SS_RESOLVE_ENUM_DISEN,
SS_RESOLVE_ENUM_ENDOFKEY
} ;
typedef struct ss_resolve_field_table_s ss_resolve_field_table_t, *ss_resolve_field_table_t_ref ;
struct ss_resolve_field_table_s
{
char *field ;
char *field ;
} ;
extern ss_resolve_field_table_t ss_resolve_field_table[] ;
......@@ -127,28 +127,28 @@ extern ss_resolve_field_table_t ss_resolve_field_table[] ;
/** Graph struct */
typedef struct ss_resolve_graph_ndeps_s ss_resolve_graph_ndeps_t ;
struct ss_resolve_graph_ndeps_s
{
uint32_t idx ;//uint32_t
genalloc ndeps ;//uint32_t
{
uint32_t idx ;//uint32_t
genalloc ndeps ;//uint32_t
} ;
#define RESOLVE_GRAPH_NDEPS_ZERO { 0 , GENALLOC_ZERO }
typedef struct ss_resolve_graph_s ss_resolve_graph_t, *ss_resolve_graph_t_ref ;
struct ss_resolve_graph_s
{
genalloc name ;//ss_resolve_t
genalloc cp ; //ss_resolve_graph_ndeps_t
genalloc sorted ;//ss_resolve_t
genalloc name ;//ss_resolve_t
genalloc cp ; //ss_resolve_graph_ndeps_t
genalloc sorted ;//ss_resolve_t
} ;
#define RESOLVE_GRAPH_ZERO { GENALLOC_ZERO , GENALLOC_ZERO , GENALLOC_ZERO }
#define RESOLVE_GRAPH_ZERO { GENALLOC_ZERO , GENALLOC_ZERO , GENALLOC_ZERO }
typedef enum visit_e visit ;
enum visit_e
{
SS_WHITE = 0,
SS_GRAY,
SS_BLACK
} ;
SS_WHITE = 0,
SS_GRAY,
SS_BLACK
} ;
extern ss_resolve_t const ss_resolve_zero ;
extern void ss_resolve_init(ss_resolve_t *res) ;
......@@ -159,9 +159,7 @@ extern int ss_resolve_src_path(stralloc *sasrc,char const *sv, uid_t owner,char
extern int ss_resolve_module_path(stralloc *sdir, stralloc *mdir, char const *sv,char const *src_frontend, uid_t owner) ;
extern int ss_resolve_src(stralloc *sasrc, char const *name, char const *src,int *found) ;
extern int ss_resolve_service_isdir(char const *dir, char const *name) ;
extern int ss_resolve_add_uint32(stralloc *sa, uint32_t data) ;
extern uint32_t ss_resolve_add_string(ss_resolve_t *res,char const *data) ;
extern int ss_resolve_pack(stralloc *sa,ss_resolve_t *res) gccattr_deprecated ;
extern int ss_resolve_write(ss_resolve_t *res,char const *dst,char const *name) ;
extern int ss_resolve_read(ss_resolve_t *res,char const *src,char const *name) ;
extern int ss_resolve_check(char const *src, char const *name) ;
......
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