strv: return NULL from strv_free()

[elogind.git] / src / shared / machine-image.c

diff --git a/src/shared/machine-image.c b/src/shared/machine-image.c
index 552847e0f0119890255d3244629dcecd3cbd8d41..edf986d4db11801abb0ca47c79b8003793189f3a 100644 (file)
--- a/src/shared/machine-image.c
+++ b/src/shared/machine-image.c
@@ -369,7 +369,7 @@ int image_remove(Image *i) {
                 return rm_rf_dangerous(i->path, false, true, false);
 
         default:
-                return -ENOTSUP;
+                return -EOPNOTSUPP;
         }
 }
 
@@ -430,7 +430,7 @@ int image_rename(Image *i, const char *new_name) {
         }
 
         default:
-                return -ENOTSUP;
+                return -EOPNOTSUPP;
         }
 
         if (!new_path)
@@ -440,8 +440,9 @@ int image_rename(Image *i, const char *new_name) {
         if (!nn)
                 return -ENOMEM;
 
-        if (renameat2(AT_FDCWD, i->path, AT_FDCWD, new_path, RENAME_NOREPLACE) < 0)
-                return -errno;
+        r = rename_noreplace(AT_FDCWD, i->path, AT_FDCWD, new_path);
+        if (r < 0)
+                return r;
 
         /* Restore the immutable bit, if it was set before */
         if (file_attr & FS_IMMUTABLE_FL)
@@ -497,7 +498,7 @@ int image_clone(Image *i, const char *new_name, bool read_only) {
                 break;
 
         default:
-                return -ENOTSUP;
+                return -EOPNOTSUPP;
         }
 
         if (r < 0)
@@ -562,7 +563,7 @@ int image_read_only(Image *i, bool b) {
         }
 
         default:
-                return -ENOTSUP;
+                return -EOPNOTSUPP;
         }
 
         return 0;
@@ -621,7 +622,7 @@ int image_set_limit(Image *i, uint64_t referenced_max) {
                 return -EROFS;
 
         if (i->type != IMAGE_SUBVOLUME)
-                return -ENOTSUP;
+                return -EOPNOTSUPP;
 
         return btrfs_quota_limit(i->path, referenced_max);
 }