goto finish;
}
- unit = join(arg_dest, "/", name, NULL);
+ unit = strjoin(arg_dest, "/", name, NULL);
if (!unit) {
log_error("Out of memory");
r = -ENOMEM;
}
if (!noauto) {
- lnk = join(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
+ lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
if (!lnk) {
log_error("Out of memory");
r = -ENOMEM;
if (r > 0) {
free(lnk);
- lnk = join(arg_dest, "/", device, ".wants/", name, NULL);
+ lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
if (!lnk) {
log_error("Out of memory");
r = -ENOMEM;
goto finish;
}
- unit = join(arg_dest, "/", name, NULL);
+ unit = strjoin(arg_dest, "/", name, NULL);
if (!unit) {
log_error("Out of memory");
r = -ENOMEM;
}
if (!noauto) {
- lnk = join(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
+ lnk = strjoin(arg_dest, "/", post, nofail || automount ? ".wants/" : ".requires/", name, NULL);
if (!lnk) {
log_error("Out of memory");
r = -ENOMEM;
if (r > 0) {
free(lnk);
- lnk = join(arg_dest, "/", device, ".wants/", name, NULL);
+ lnk = strjoin(arg_dest, "/", device, ".wants/", name, NULL);
if (!lnk) {
log_error("Out of memory");
r = -ENOMEM;
goto finish;
}
- automount_unit = join(arg_dest, "/", automount_name, NULL);
+ automount_unit = strjoin(arg_dest, "/", automount_name, NULL);
if (!automount_unit) {
log_error("Out of memory");
r = -ENOMEM;
}
free(lnk);
- lnk = join(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);
+ lnk = strjoin(arg_dest, "/", post, nofail ? ".wants/" : ".requires/", automount_name, NULL);
if (!lnk) {
log_error("Out of memory");
r = -ENOMEM;