diff --git a/src/lib66/db/db_switch_to.c b/src/lib66/db/db_switch_to.c index 5c37a094ef008a95c0896d9de79043852ebc2490..679f9609a19764b1998a959e6f21934342ca8641 100644 --- a/src/lib66/db/db_switch_to.c +++ b/src/lib66/db/db_switch_to.c @@ -29,7 +29,7 @@ /** 1-> backup * 0-> ori */ -int db_switch_to(ssexec_t *info, char const *const *envp,unsigned int where) +int db_switch_to(ssexec_t *info, unsigned int where) { log_flow() ; @@ -80,7 +80,7 @@ int db_switch_to(ssexec_t *info, char const *const *envp,unsigned int where) goto err ; } log_trace("update ",info->livetree.s,"/",info->treename.s," to ",db.s,"/",info->treename.s) ; - if (!db_update(db.s, info,envp)) + if (!db_update(db.s, info)) { log_trace("rollback db service: ", info->treename.s) ; memcpy(cmd + cmdlen," -s0",4) ; @@ -114,7 +114,7 @@ int db_switch_to(ssexec_t *info, char const *const *envp,unsigned int where) goto err ; } log_trace("update ",info->livetree.s,"/",info->treename.s," to ",db.s,"/",info->treename.s) ; - if (!db_update(db.s, info,envp)) + if (!db_update(db.s, info)) { log_trace("rollback db: ", info->treename.s) ; memcpy(cmd + cmdlen," -s1",4) ; diff --git a/src/lib66/db/db_update.c b/src/lib66/db/db_update.c index 95c4b7138044e130a4ce64f27b13d22361151686..11bea0e543f5bb073a9260e67d06c9cfe19e5c36 100644 --- a/src/lib66/db/db_update.c +++ b/src/lib66/db/db_update.c @@ -28,7 +28,7 @@ #include <66/utils.h> #include <66/ssexec.h> -int db_update(char const *newdb, ssexec_t *info,char const *const *envp) +int db_update(char const *newdb, ssexec_t *info) { log_flow() ; @@ -56,7 +56,7 @@ int db_update(char const *newdb, ssexec_t *info,char const *const *envp) newargv[m++] = db ; newargv[m++] = 0 ; - pid = child_spawn0(newargv[0],newargv,envp) ; + pid = child_spawn0(newargv[0],newargv, (char const *const *)environ) ; if (waitpid_nointr(pid,&wstat, 0) < 0) log_warnusys_return(LOG_EXIT_ZERO,"wait for ",newargv[0]) ;