diff options
Diffstat (limited to 'src/repo/s6rc_repo_moveservices.c')
| -rw-r--r-- | src/repo/s6rc_repo_moveservices.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/repo/s6rc_repo_moveservices.c b/src/repo/s6rc_repo_moveservices.c index cac2052..5d0b5d1 100644 --- a/src/repo/s6rc_repo_moveservices.c +++ b/src/repo/s6rc_repo_moveservices.c @@ -10,7 +10,7 @@ #include <s6-rc/repo.h> -int s6rc_repo_moveservices (char const *repo, char const *set, s6rc_repo_sv const *services, uint32_t n, uint8_t newsub, char const *storage, unsigned int verbosity) +int s6rc_repo_moveservices (char const *repo, char const *set, s6rc_repo_sv const *services, uint32_t n, uint8_t newrx, char const *storage, unsigned int verbosity) { size_t repolen = strlen(repo) ; size_t setlen = strlen(set) ; @@ -28,19 +28,19 @@ int s6rc_repo_moveservices (char const *repo, char const *set, s6rc_repo_sv cons oldfn[repolen + 9 + setlen] = '/' ; oldfn[repolen + 16 + setlen] = '/' ; memcpy(newfn, oldfn, repolen + 10 + setlen) ; - memcpy(newfn + repolen + 10 + setlen, s6rc_repo_subnames[newsub], 6) ; + memcpy(newfn + repolen + 10 + setlen, s6rc_repo_rxnames[newrx], 6) ; newfn[repolen + 16 + setlen] = '/' ; for (uint32_t i = 0 ; i < n ; i++) { size_t len = strlen(storage + services[i].pos) ; - memcpy(oldfn + repolen + setlen + 10, s6rc_repo_subnames[services[i].sub], 6) ; + memcpy(oldfn + repolen + setlen + 10, s6rc_repo_rxnames[services[i].rx], 6) ; memcpy(oldfn + repolen + setlen + 17, storage + services[i].pos, len + 1) ; memcpy(newfn + repolen + setlen + 17, storage + services[i].pos, len + 1) ; if (access(newfn, F_OK) == 0) { if (verbosity >= 2) - strerr_warni8x("service ", storage + services[i].pos, " already existed in subset ", s6rc_repo_subnames[newsub], " of set ", set, " in repository ", repo) ; + strerr_warni8x("service ", storage + services[i].pos, " already existed in rxset ", s6rc_repo_rxnames[newrx], " of set ", set, " in repository ", repo) ; } else if (errno != ENOENT) { @@ -54,7 +54,7 @@ int s6rc_repo_moveservices (char const *repo, char const *set, s6rc_repo_sv cons } if (verbosity >= 4) { - strerr_warnt10x("repository ", repo, ", set ", set, ", from subset ", s6rc_repo_subnames[services[i].sub], " to subset ", s6rc_repo_subnames[newsub], ": successfully moved service ", storage + services[i].pos) ; + strerr_warnt10x("repository ", repo, ", set ", set, ", from rxset ", s6rc_repo_rxnames[services[i].rx], " to rxset ", s6rc_repo_rxnames[newrx], ": successfully moved service ", storage + services[i].pos) ; } } if (n) |