From 6f5f3337d8c16bf08be941663b0b8605e0c684ec Mon Sep 17 00:00:00 2001 From: Vladimir Serbinenko Date: Sun, 15 Dec 2013 14:21:14 +0100 Subject: [PATCH] * grub-core/disk/cryptodisk.c: Rename "n" to "last_cryptodisk_id". --- ChangeLog | 4 ++++ grub-core/disk/cryptodisk.c | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index db0f37883..b97cb823f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2013-12-15 Vladimir Serbinenko + + * grub-core/disk/cryptodisk.c: Rename "n" to "last_cryptodisk_id". + 2013-12-15 Vladimir Serbinenko * util/grub-mkimagexx.c (relocate_addresses): Display offset rather diff --git a/grub-core/disk/cryptodisk.c b/grub-core/disk/cryptodisk.c index 9a4509bf0..75c6e1f91 100644 --- 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;