* grub-core/disk/cryptodisk.c: Rename "n" to "last_cryptodisk_id".

diff --git a/ChangeLog b/ChangeLog
index db0f37883b3d353cc3570e64786743c390ae9390..b97cb823fda4f540b4cf421be69b0e1030046590 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/disk/cryptodisk.c: Rename "n" to "last_cryptodisk_id".
+
 2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * util/grub-mkimagexx.c (relocate_addresses): Display offset rather

diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c
index 9a4509bf04a368b2186669b09bce856ddc8a6114..75c6e1f91ac4c405fa892f07f3f9a224bb1b1ade 100644 (file)
--- a/grub-core/disk/cryptodisk.c
+++ b/grub-core/disk/cryptodisk.c
@@ -51,7 +51,7 @@ static inline int GF_PER_SECTOR (const struct grub_cryptodisk *dev)
 }
 
 static grub_cryptodisk_t cryptodisk_list = NULL;
-static grub_uint8_t n = 0;
+static grub_uint8_t last_cryptodisk_id = 0;
 
 static void
 gf_mul_x (grub_uint8_t *g)
@@ -707,7 +707,7 @@ grub_cryptodisk_insert (grub_cryptodisk_t newdev, const char *name,
       return grub_errno;
     }
 
-  newdev->id = n++;
+  newdev->id = last_cryptodisk_id++;
   newdev->source_id = source->id;
   newdev->source_dev_id = source->dev->id;
   newdev->next = cryptodisk_list;
@@ -753,7 +753,7 @@ grub_cryptodisk_cheat_insert (grub_cryptodisk_t newdev, const char *name,
   newdev->cheat_fd = GRUB_UTIL_FD_INVALID;
   newdev->source_id = source->id;
   newdev->source_dev_id = source->dev->id;
-  newdev->id = n++;
+  newdev->id = last_cryptodisk_id++;
   newdev->next = cryptodisk_list;
   cryptodisk_list = newdev;