gpt-auto-generator: rename open_parent() → open_parent_devno() so that we can include...
authorLennart Poettering <lennart@poettering.net>
Thu, 20 Dec 2018 14:15:43 +0000 (15:15 +0100)
committerLennart Poettering <lennart@poettering.net>
Fri, 1 Mar 2019 13:11:07 +0000 (14:11 +0100)
As that header also defines a function open_parent() which does
something different.

src/gpt-auto-generator/gpt-auto-generator.c

index 09c0bcb..0ce9cf0 100644 (file)
@@ -483,7 +483,7 @@ static int add_root_rw(DissectedPartition *p) {
         return 0;
 }
 
-static int open_parent(dev_t devnum, int *ret) {
+static int open_parent_devno(dev_t devnum, int *ret) {
         _cleanup_(sd_device_unrefp) sd_device *d = NULL;
         const char *name, *devtype, *node;
         sd_device *parent;
@@ -551,7 +551,7 @@ static int enumerate_partitions(dev_t devnum) {
         _cleanup_(dissected_image_unrefp) DissectedImage *m = NULL;
         int r, k;
 
-        r = open_parent(devnum, &fd);
+        r = open_parent_devno(devnum, &fd);
         if (r <= 0)
                 return r;